release: Merge default into stable for release preparation

docs/release-notes/release-notes-4.19.0.rst

@@ -0,0 +1,156 b''
+|RCE| 4.19.0 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2020-05-22
+
+
+New Features
+^^^^^^^^^^^^
+
+- Pull requests: add information about changes in source repositories in pull-request show page.
+  Fixes #5611, Fixes #5561
+  Added new preview for size (commits/files) of PRs before opening, this is now based
+  on the special logic that calculates common ancestor and has access to preview diff
+  Store common ancestor in DB so updates of pull-requests are consistent
+- Pull requests: fixed case for GIT repositories when a merge check failed due to
+  merge conflicts the pull request wrongly reported missing commits.
+  we're now searching for dangling commits in a repo that has them and cannot see them
+  because of failed merge checks.
+- Pull requests: allow filter displayed results by author
+- Pull requests: added filters to my account pull requests page.
+- Quick search: added ability to search for pull-requests using `pr:` prefix.
+  Permissions are checked against the access to target repositories, and users
+  can now search for pull request number, description or title.
+- UI: replaced js prompts with sweet-alert prompts.
+- SVN: bumped shipped SVN to 1.13.0 release.
+- Integration Hooks: added new hooks for comments on pull requests and commits.
+  Allows writing custom actions on top of commenting.
+  E.g `@CI-BOT re-test` could trigger CI job to re-test a pull requests or commit.
+  Added new rcextension hooks, Fixes #5583, and added examples on how to trigger CI build on certain comments.
+- Exception tracker: added possibility to send notification email when server encountered an unhandled exception.
+  new .ini file flag: `exception_tracker.send_email = false` and `exception_tracker.send_email_recipients =`
+  can be set to enable this function.
+- Mercurial: enable enhanced diffs for Mercurial that show context of changed functions inside the diff.
+  This makes diff actually more consistent with how GIT backend shows them. Fixes #5614
+
+
+General
+^^^^^^^
+
+- Pull requests: fixed small UI glitches in pull request view.
+- System Info: Python packages now expose the package location info.
+- API: added new flag to comment api to disable email sending when creating a comment.
+- Exceptions: don't report lookup errors as exceptions stored in the exception store.
+  Those are regular not found problems that don't indicate any exceptional case
+  also make the errors report nicer, not as KeyError, or generic Exception
+- Exception tracker: store request info if available to track which URL caused an error.
+- Integrations: handle new commenting events and optimize calls for Jira/Redmine
+  Speed up issue fetching by optimizing how Jira/Redmine client behaves
+  For redmine we don't iterate issues anymore which is *much* faster, and makes pushes with tickets faster.
+- SVN: allow to specify any svn compatible version string not only hardcoded values.
+  The new SVN code allows to specify this by numeric values now. e.g 1.13 etc.
+  Fixes #5605.
+- Emails: added `premailer` parsing for inline style formatting to make emails render
+  nicer on all email clients.
+- Repositories: switched repo type selector to radio buttons and preserve order of
+  enabled backends inside .ini files.
+- Repositories: show recommendation for updating hooks if they are outdated.
+- Files: add pre-commit checks on file edit/delete/add operations. This prevents
+  loosing content while editing when repositories changes during those operations.
+  Fixes #5607.
+- Files: changed the copy path label to indicate we're actually copying only the path.
+  Added copy permalink helper to copy the url quickly. Fixes #5602
+- LDAP: updated ldap plugin to help with debug and support by extending logging and
+  improving error messages.
+- LDAP: fixed example LDAPs port.
+- Dependencies: bump redmine client.
+- Dependencies: bumped bleach==3.1.3
+- Dependencies: bumped webtest==2.0.34
+- Dependencies: bumped packaging==20.3
+- Dependencies: bumped pyparsing==2.4.7
+- Dependencies: bumped sqlalchemy==1.3.15
+- Dependencies: bumped hupper==1.10.2
+- Dependencies: bumped alembic==1.4.2
+- Dependencies: bumped wcwidth==0.1.9
+- Dependencies: bumped python-ldap==3.2.0
+- Dependencies: bumped importlib-metadata==1.5.0
+- Dependencies: bumped redis==3.4.1
+- Dependencies: bumped importlib-metadata==1.6.0
+- Dependencies: bumped pytz==2019.3
+- Dependencies: bumped paste==3.4.0
+- Dependencies: bumped weberror==0.13.1
+- Dependencies: bumped pyparsing==2.4.6
+- Dependencies: bumped ipdb==0.13.2
+- Dependencies: bumped pastedeploy==2.1.0
+- Dependencies: bumped docutils==0.16.0
+- Dependencies: bumped pyramid-debugtoolbar==4.6.1
+- Dependencies: bumped gevent==1.5.0
+- Dependencies: bumped psutil==5.7.0
+
+
+Security
+^^^^^^^^
+
+- Logging: expose usernames in the logs for each request made to RhodeCode.
+  This enables auditing capabilities for all actions against the web interface.
+- Users: increased security on the way we're displaying authentication tokens.
+  We don't expose all on single page. Request needs a validation before viewing of each token.
+- Logging: added some nicer logging for file path ACL checks.
+- Audit Log: extend the commit api data with references to commit_id or pull_request_id.
+  This allows tracking those in the audit-logs.
+
+
+Performance
+^^^^^^^^^^^
+
+- Exception Tracker: optimized the check for smtp_server before doing heavy lifting
+  of exception email sending.
+- Auth: enabled cache flags for fetching ACL ids.
+  Those are now safe to cache since we have a proper cache invalidation logic for
+  permissions of users, for lots of repo this makes our goto switcher much much faster.
+- Application: use simpler way to extract default_user_id, this will be now registered
+  at server boot, reducing number of times we fetch this from database.
+- Pull requests: changed reviewers metadata function for optimizing the diff calculations.
+  We're now doing a single request to calculate reviewers and diff preview instead of twice like before.
+
+
+Fixes
+^^^^^
+
+- GIT: fixed readme searcher for Git repositories using libgit2 and non-ascii directories.
+- Full text search: fixed error while highlighting special search terms e.g 'enabled \= '
+- Full text search: fixed problems with non-ascii files indexing.
+- Diffs: improve text on unresolved comments attached to files that no longer exist in the review.
+  Fixes #5615.
+- Auth: fixed generation of authomatic secrets for new plugins.
+- Auth: failsafe github auth if it doesn't provide full name for users.
+- Permissions: fixed problem with permissions changes from permission page due to missing cache flush.
+  This caused certain permission changed be visible after some time of the edit.
+  We now ensure *all* caches used for permissions are properly flushed right after the change.
+- SVN: explicitly specify tunnel-user to properly map rhodecode username on svn commit
+  via SSH backend. Fixes #5608.
+- SVN: fixed case of wrong extracted repository name for SSH backend. In cases
+  where we commit to a nested subdirs SVN reported the access path with the subdir paths in it.
+  We couldn't then match that extended name into proper rhodecode repository for ACL checks.
+  Current implementation gives an slight overhead as we have to lookup all repositories.
+  Fixes #5606
+- SVN: fixed problem with special characters inside subdirectories.
+- SVN: fixed SVN refs switcher on files that used old format of diff url. Fixes #5599, #5610
+- Search: remove excessive quoting on search pagination. Fixes #5604
+- File browser: fixed the repo switcher `?at=` flag being lost when walking on the file tree.
+- File browser: fixed unicode problems on image preview, and make images center, no-stretch.
+- DB migrations: fixed db migrate for latest sqlite version.
+- Feed generator: fixed missing utc definition that could cause server 500 error.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- RhodeCode has been tested on CentOS/RHEL 8 and we added those as officially supported platforms.
+- This release introduces lots of optimizations and changes how the pull requests reviewers,
+  and diff preview is made. We cut the pull request creation time by 50%.
+  Please look closer to this new logic na report any potential problems with this change.
+- SVN was bumped to 1.13 version.
  No newline at end of file

rhodecode/config/rcextensions/examples/trigger_ci_call_on_comment.py

@@ -0,0 +1,60 b''
+# Example to trigger a CI call action on specific comment text, e.g chatops and ci
+# rebuild on mention of ci bot
+
+@has_kwargs({
+    'repo_name': '',
+    'repo_type': '',
+    'description': '',
+    'private': '',
+    'created_on': '',
+    'enable_downloads': '',
+    'repo_id': '',
+    'user_id': '',
+    'enable_statistics': '',
+    'clone_uri': '',
+    'fork_id': '',
+    'group_id': '',
+    'created_by': '',
+    'repository': '',
+    'comment': '',
+    'commit': ''
+})
+def _comment_commit_repo_hook(*args, **kwargs):
+    """
+    POST CREATE REPOSITORY COMMENT ON COMMIT HOOK. This function will be executed after
+    a comment is made on this repository commit.
+
+    """
+    from .helpers import http_call, extra_fields
+    from .utils import UrlTemplate
+    # returns list of dicts with key-val fetched from extra fields
+    repo_extra_fields = extra_fields.run(**kwargs)
+
+    import rhodecode
+    from rc_integrations.jenkins_ci import csrf_call, get_auth, requests_retry_call
+
+    endpoint_url = extra_fields.get_field(
+        repo_extra_fields, key='ci_endpoint_url',
+        default='http://ci.rc.com/job/rc-ce-commits/build?COMMIT_ID=${commit}')
+    mention_text = extra_fields.get_field(
+        repo_extra_fields, key='ci_mention_text',
+        default='@jenkins build')
+
+    endpoint_url = UrlTemplate(endpoint_url).safe_substitute(
+        commit=kwargs['commit']['raw_id'])
+
+    trigger_ci = False
+    comment = kwargs['comment']['comment_text']
+    if mention_text in comment:
+        trigger_ci = True
+
+    if trigger_ci is False:
+        return HookResponse(0, '')
+
+    # call some CI based on the special coment mention marker
+    data = {
+        'project': kwargs['repository'],
+    }
+    response = http_call.run(url=endpoint_url, params=data)
+
+    return HookResponse(0, '')
  No newline at end of file

.bumpversion.cfg

@@ -1,5 +1,5 b''
 [bumpversion]
-current_version = 4.18.3
+current_version = 4.19.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.18.3
-
-[task:updated_translation]
+state = in_progress
+version = 4.19.0
 
 [task:generate_js_routes]
 

Makefile

@@ -1,10 +1,11 b''
 
-.PHONY: clean docs docs-clean docs-cleanup test test-clean test-only test-only-postgres test-only-mysql web-build generate-pkgs
+.PHONY: clean docs docs-clean docs-cleanup test test-clean test-only test-only-postgres test-only-mysql web-build generate-pkgs pip-packages
 
 NODE_PATH=./node_modules
 WEBPACK=./node_binaries/webpack
 GRUNT=./node_binaries/grunt
-
+# set by: PATH_TO_OUTDATED_PACKAGES=/some/path/outdated_packages.py
+OUTDATED_PACKAGES = ${PATH_TO_OUTDATED_PACKAGES}
 
 clean:
 	make test-clean
@@ -55,6 +56,9 b' web-build:'
 generate-pkgs:
 	nix-shell pkgs/shell-generate.nix --command "pip2nix generate --licenses"
 
+pip-packages:
+	python ${OUTDATED_PACKAGES}
+
 generate-js-pkgs:
 	rm -rf node_modules && \
 	nix-shell pkgs/shell-generate.nix --command "node2nix --input package.json -o pkgs/node-packages.nix -e pkgs/node-env.nix -c pkgs/node-default.nix -d --flatten --nodejs-8" && \

configs/development.ini

@@ -350,6 +350,17 b' labs_settings_active = true'
 ; This is used to store exception from RhodeCode in shared directory
 #exception_tracker.store_path =
 
+; Send email with exception details when it happens
+#exception_tracker.send_email = false
+
+; Comma separated list of recipients for exception emails,
+; e.g [e-mail],[e-mail]
+; Can be left empty, then emails will be sent to ALL super-admins
+#exception_tracker.send_email_recipients =
+
+; optional prefix to Add to email Subject
+#exception_tracker.email_prefix = [RHODECODE ERROR]
+
 ; File store configuration. This is used to store and serve uploaded files
 file_store.enabled = true
 
@@ -605,8 +616,9 b' vcs.backends = hg, git, svn'
 vcs.connection_timeout = 3600
 
 ; Compatibility version when creating SVN repositories. Defaults to newest version when commented out.
-; Available options are: pre-1.4-compatible, pre-1.5-compatible, pre-1.6-compatible, pre-1.8-compatible, pre-1.9-compatible
-#vcs.svn.compatible_version = pre-1.8-compatible
+; Set a numeric version for your current SVN e.g 1.8, or 1.12
+; Legacy available options are: pre-1.4-compatible, pre-1.5-compatible, pre-1.6-compatible, pre-1.8-compatible, pre-1.9-compatible
+#vcs.svn.compatible_version = 1.8
 
 
 ; ####################################################

configs/production.ini

@@ -301,6 +301,17 b' labs_settings_active = true'
 ; This is used to store exception from RhodeCode in shared directory
 #exception_tracker.store_path =
 
+; Send email with exception details when it happens
+#exception_tracker.send_email = false
+
+; Comma separated list of recipients for exception emails,
+; e.g [e-mail],[e-mail]
+; Can be left empty, then emails will be sent to ALL super-admins
+#exception_tracker.send_email_recipients =
+
+; optional prefix to Add to email Subject
+#exception_tracker.email_prefix = [RHODECODE ERROR]
+
 ; File store configuration. This is used to store and serve uploaded files
 file_store.enabled = true
 
@@ -556,8 +567,9 b' vcs.backends = hg, git, svn'
 vcs.connection_timeout = 3600
 
 ; Compatibility version when creating SVN repositories. Defaults to newest version when commented out.
-; Available options are: pre-1.4-compatible, pre-1.5-compatible, pre-1.6-compatible, pre-1.8-compatible, pre-1.9-compatible
-#vcs.svn.compatible_version = pre-1.8-compatible
+; Set a numeric version for your current SVN e.g 1.8, or 1.12
+; Legacy available options are: pre-1.4-compatible, pre-1.5-compatible, pre-1.6-compatible, pre-1.8-compatible, pre-1.9-compatible
+#vcs.svn.compatible_version = 1.8
 
 
 ; ####################################################

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

@@ -59,3 +59,46 b' exit the ishell after the execution::'
 
     echo "%run repo_delete_task.py" | rccontrol ishell enterprise-1
 
+
+
+
+Bulk edit permissions for all repositories or groups
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In case when a permissions should be applied in bulk here are two ways to apply
+the permissions onto *all* repositories and/or repository groups.
+
+1) Start by running the interactive ishell interface
+
+.. code-block:: bash
+   :dedent: 1
+
+    # starts the ishell interactive prompt
+    $ rccontrol ishell enterprise-1
+
+
+2a) Add user called 'admin' into all repositories with write permission.
+    Permissions can be also `repository.read`, `repository.admin`, `repository.none`
+
+.. code-block:: python
+   :dedent: 1
+
+   In [1]: from rhodecode.model.repo import RepoModel
+   In [2]: user = User.get_by_username('admin')
+   In [3]: permission_name = 'repository.write'
+   In [4]: for repo in Repository.get_all():
+      ...:     RepoModel().grant_user_permission(repo, user, permission_name)
+      ...:     Session().commit()
+
+2b) Add user called 'admin' into all repository groups with write permission.
+    Permissions can be also can be `group.read`, `group.admin`, `group.none`
+
+.. code-block:: python
+   :dedent: 1
+
+   In [1]: from rhodecode.model.repo import RepoModel
+   In [2]: user = User.get_by_username('admin')
+   In [3]: permission_name = 'group.write'
+   In [4]: for repo_group in RepoGroup.get_all():
+       ...:     RepoGroupModel().grant_user_permission(repo_group, user, permission_name)
+       ...:     Session().commit()
  No newline at end of file

docs/admin/system-overview.rst

@@ -22,8 +22,9 b' Supported Operating Systems'
 Linux
 ^^^^^
 
-* Ubuntu 14.04
-* CentOS 6.2 and 7
+* Ubuntu 14.04+
+* CentOS 6.2, 7 and 8
+* RHEL 6.2, 7 and 8
 * Debian 7.8
 * RedHat Fedora
 * Arch Linux

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

@@ -39,7 +39,7 b' close_pull_request'
 comment_pull_request 
 --------------------
 
-.. py:function:: comment_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, message=<Optional:None>, commit_id=<Optional:None>, status=<Optional:None>, comment_type=<Optional:u'note'>, resolves_comment_id=<Optional:None>, extra_recipients=<Optional:[]>, userid=<Optional:<OptionalAttr:apiuser>>)
+.. py:function:: comment_pull_request(apiuser, pullrequestid, repoid=<Optional:None>, message=<Optional:None>, commit_id=<Optional:None>, status=<Optional:None>, comment_type=<Optional:u'note'>, resolves_comment_id=<Optional:None>, extra_recipients=<Optional:[]>, userid=<Optional:<OptionalAttr:apiuser>>, send_email=<Optional:True>)
 
    Comment on the pull request specified with the `pullrequestid`,
    in the |repo| specified by the `repoid`, and optionally change the
@@ -70,6 +70,8 b' comment_pull_request'
    :type extra_recipients: Optional(list)
    :param userid: Comment on the pull request as this user
    :type userid: Optional(str or int)
+   :param send_email: Define if this comment should also send email notification
+   :type send_email: Optional(bool)
 
    Example output:
 
@@ -160,6 +162,7 b' get_pull_request'
            "status" :           "<status>",
            "created_on":        "<date_time_created>",
            "updated_on":        "<date_time_updated>",
+           "versions":          "<number_or_versions_of_pr>",
            "commit_ids":        [
                                     ...
                                     "<commit_id>",
@@ -249,7 +252,9 b' get_pull_request_comments'
              },
              "comment_text": "Example text",
              "comment_type": null,
-             "pull_request_version": null
+             "pull_request_version": null,
+             "comment_commit_id": None,
+             "comment_pull_request_id": <pull_request_id>
            }
        ],
        error :  null

docs/api/methods/repo-methods.rst

@@ -28,7 +28,7 b' add_field_to_repo'
 comment_commit 
 --------------
 
-.. py:function:: comment_commit(apiuser, repoid, commit_id, message, status=<Optional:None>, comment_type=<Optional:u'note'>, resolves_comment_id=<Optional:None>, extra_recipients=<Optional:[]>, userid=<Optional:<OptionalAttr:apiuser>>)
+.. py:function:: comment_commit(apiuser, repoid, commit_id, message, status=<Optional:None>, comment_type=<Optional:u'note'>, resolves_comment_id=<Optional:None>, extra_recipients=<Optional:[]>, userid=<Optional:<OptionalAttr:apiuser>>, send_email=<Optional:True>)
 
    Set a commit comment, and optionally change the status of the commit.
 
@@ -52,6 +52,8 b' comment_commit'
    :type extra_recipients: Optional(list)
    :param userid: Set the user name of the comment creator.
    :type userid: Optional(str or int)
+   :param send_email: Define if this comment should also send email notification
+   :type send_email: Optional(bool)
 
    Example error output:
 

docs/api/methods/search-methods.rst

@@ -3,6 +3,21 b''
 search methods
 ==============
 
+get_audit_logs 
+--------------
+
+.. py:function:: get_audit_logs(apiuser, query)
+
+   return full audit logs based on the query.
+
+   Please see `example query in admin > settings > audit logs` for examples
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param query: filter query, example: action:repo.artifact.add date:[20200401 TO 20200601]"
+   :type query: str
+
+
 search 
 ------
 

docs/auth/auth-ldap-groups.rst

@@ -68,7 +68,7 b' Below is example setup that can be used '
     #  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)
+    # Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL)
 
     *option*: `timeout` => `300`
     # Timeout for LDAP connection

docs/auth/auth-ldap.rst

@@ -58,7 +58,7 b' Below is example setup that can be used '
     #  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)
+    # Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL)
 
     *option*: `timeout` => `300`
     # Timeout for LDAP connection

docs/auth/ldap-active-directory.rst

@@ -22,7 +22,7 b' authentication::'
     #  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)
+    # Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL)
 
     *option*: `timeout` => `300`
     # Timeout for LDAP connection

docs/contributing/dev-setup.rst

@@ -19,7 +19,7 b' Setup Nix Package Manager'
 
 To install the Nix Package Manager, please run::
 
-   $ curl https://nixos.org/releases/nix/nix-2.0.4/install | sh
+   $ curl https://releases.nixos.org/nix/nix-2.3.4/install | sh
 
 or go to https://nixos.org/nix/ and follow the installation instructions.
 Once this is correctly set up on your system, you should be able to use the
@@ -47,12 +47,12 b' Switch nix to the latest STABLE channel'
 
 run::
 
-   nix-channel --add https://nixos.org/channels/nixos-18.03 nixpkgs
+   nix-channel --add https://nixos.org/channels/nixos-20.03 nixpkgs
 
 Followed by::
 
    nix-channel --update
-   nix-env -i nix-2.0.4
+   nix-env -i nix-2.3.4
 
 
 Install required binaries

docs/known-issues/known-issues.rst

@@ -3,20 +3,6 b''
 Known Issues
 ============
 
-Subversion Issues
------------------
-
-Limited |svn| support has been achieved for this release,
-|release|. The following known issues are in development for improvement.
-
-* |svn| |repo| creation:
-  Terminating the VCS Server during remote importation of |svn| |repos| leaves
-  the the process still running in the background.
-
-* |svn| |repo| checkin/checkout:
-  |svn| cloning support is not enabled by default. Please contact support if
-  you want it enabled.
-
 Windows Upload
 --------------
 
@@ -49,12 +35,16 b' shipped with the optimal configuration a'
 To fix this issue, upgrade to |RCE| 3.3.2 or greater, and if you discover
 memory consumption issues check the VCS Server settings.
 
-Fedora 23 / Ubuntu 18.04
-------------------------
+Newer Operating system locales
+------------------------------
 
 |RCC| has a know problem with locales, due to changes in glibc 2.27+ which affects
 the local-archive format, which is now incompatible with our used glibc 2.26.
 
+Mostly affected are:
+- Fedora 23+
+- Ubuntu 18.04
+- CentOS / RHEL 8
 
 To work around this problem, you need set path to ``$LOCAL_ARCHIVE`` to the
 locale package in older pre glibc 2.27 format, or set `LC_ALL=C` in your enviroment.
@@ -74,8 +64,15 b' 2. Point ``$LOCAL_ARCHIVE`` to the local'
 
     $ export LOCALE_ARCHIVE=/home/USER/locale-archive  # change to your path
 
-This can either added in `~/.rccontrol/supervisor/supervisord.ini`
-or in user .bashrc/.zshrc etc, or via a startup script that
+This should be added *both* in `enviroment` variable of `~/.rccontrol/supervisor/supervisord.ini`
+e.g
+
+```
+[supervisord]
+environment = HOME=/home/user/rhodecode,LOCALE_ARCHIVE=/YOUR-PATH/locale-archive`
+```
+
+and in user .bashrc/.zshrc etc, or via a startup script that
 runs `rccontrol self-init`
 
 If you happen to be running |RCC| from systemd, use the following

docs/release-notes/release-notes.rst

@@ -9,6 +9,7 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.19.0.rst
    release-notes-4.18.3.rst
    release-notes-4.18.2.rst
    release-notes-4.18.1.rst

docs/requirements_docs.txt

@@ -1,7 +1,7 b''
 sphinx==1.8.2
 six==1.11.0
 sphinx_rtd_theme==0.4.1
-docutils==0.14.0
+docutils==0.16.0
 pygments==2.3.0
 markupsafe==1.0.0
 jinja2==2.9.6

grunt_config.json

@@ -35,7 +35,8 b''
         "<%= dirs.js.node_modules %>/moment/min/moment.min.js",
         "<%= dirs.js.node_modules %>/clipboard/dist/clipboard.min.js",
         "<%= dirs.js.node_modules %>/favico.js/favico-0.3.10.min.js",
-        "<%= dirs.js.node_modules %>/dropzone/dist/dropzone.js",
+        "<%= dirs.js.node_modules %>/dropzone/dist/min/dropzone.min.js",
+        "<%= dirs.js.node_modules %>/sweetalert2/dist/sweetalert2.min.js",
         "<%= dirs.js.node_modules %>/sticky-sidebar/dist/sticky-sidebar.min.js",
         "<%= dirs.js.node_modules %>/sticky-sidebar/dist/jquery.sticky-sidebar.min.js",
         "<%= dirs.js.node_modules %>/waypoints/lib/noframework.waypoints.min.js",

package.json

@@ -23,6 +23,7 b''
     "grunt-contrib-watch": "^0.6.1",
     "grunt-webpack": "^3.1.3",
     "grunt-contrib-uglify": "^4.0.1",
+    "sweetalert2": "^9.10.12",
     "jquery": "1.11.3",
     "mark.js": "8.11.1",
     "jshint": "^2.9.1-rc3",

pkgs/node-packages.nix

@@ -49,13 +49,13 b' let'
         sha512 = "7+TPEAfWsRdhj1Y8UeF1759ktpVu+c3sG16rJiUC3wF9+woQ9xI1zUm2d59i7Yc3aDEJrR/Q8Y262KlOvyGVNg==";
       };
     };
-    "@polymer/iron-autogrow-textarea-3.0.1" = {
+    "@polymer/iron-autogrow-textarea-3.0.3" = {
       name = "_at_polymer_slash_iron-autogrow-textarea";
       packageName = "@polymer/iron-autogrow-textarea";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@polymer/iron-autogrow-textarea/-/iron-autogrow-textarea-3.0.1.tgz";
-        sha512 = "FgSL7APrOSL9Vu812sBCFlQ17hvnJsBAV2C2e1UAiaHhB+dyfLq8gGdGUpqVWuGJ50q4Y/49QwCNnLf85AdVYA==";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@polymer/iron-autogrow-textarea/-/iron-autogrow-textarea-3.0.3.tgz";
+        sha512 = "5r0VkWrIlm0JIp5E5wlnvkw7slK72lFRZXncmrsLZF+6n1dg2rI8jt7xpFzSmUWrqpcyXwyKaGaDvUjl3j4JLA==";
       };
     };
     "@polymer/iron-behaviors-3.0.1" = {
@@ -76,13 +76,13 b' let'
         sha512 = "aDr0cbCNVq49q+pOqa6CZutFh+wWpwPMLpEth9swx+GkAj+gCURhuQkaUYhIo5f2egDbEioR1aeHMnPlU9dQZA==";
       };
     };
-    "@polymer/iron-fit-behavior-3.0.1" = {
+    "@polymer/iron-fit-behavior-3.0.2" = {
       name = "_at_polymer_slash_iron-fit-behavior";
       packageName = "@polymer/iron-fit-behavior";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@polymer/iron-fit-behavior/-/iron-fit-behavior-3.0.1.tgz";
-        sha512 = "/M0B1L30k31vmwNBaGuZcxzUAhJSHoGccb/DF0CDKI/hT8UlkTvcyemaWdOpmHHLgY52ceKIkRwA3AeXrKyvaQ==";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@polymer/iron-fit-behavior/-/iron-fit-behavior-3.0.2.tgz";
+        sha512 = "JndryJYbBR3gSN5IlST4rCHsd01+OyvYpRO6z5Zd3C6u5V/m07TwAtcf3aXwZ8WBNt2eLG28OcvdSO7XR2v2pg==";
       };
     };
     "@polymer/iron-flex-layout-3.0.1" = {
@@ -112,13 +112,13 b' let'
         sha512 = "pWguPugiLYmWFV9UWxLWzZ6gm4wBwQdDy4VULKwdHCqR7OP7u98h+XDdGZsSlDPv6qoryV/e3tGHlTIT0mbzJA==";
       };
     };
-    "@polymer/iron-overlay-behavior-3.0.2" = {
+    "@polymer/iron-overlay-behavior-3.0.3" = {
       name = "_at_polymer_slash_iron-overlay-behavior";
       packageName = "@polymer/iron-overlay-behavior";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@polymer/iron-overlay-behavior/-/iron-overlay-behavior-3.0.2.tgz";
-        sha512 = "j1qmt6mJHCwpe1mKOvqK5kcCUPQr5LSrlqpgRDbUuLgUfNJ/vGTipjrkBlfbEUagm5FEQdc1VLPLSQP6WVuP9g==";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@polymer/iron-overlay-behavior/-/iron-overlay-behavior-3.0.3.tgz";
+        sha512 = "Q/Fp0+uOQQ145ebZ7T8Cxl4m1tUKYjyymkjcL2rXUm+aDQGb1wA1M1LYxUF5YBqd+9lipE0PTIiYwA2ZL/sznA==";
       };
     };
     "@polymer/iron-resizable-behavior-3.0.1" = {
@@ -157,13 +157,13 b' let'
         sha512 = "JRNBc+Oj9EWnmyLr7FcCr8T1KAnEHPh6mosln9BUdkM+qYaYsudSICh3cjTIbnj6AuF5OJidoLkM1dlyj0j6Zg==";
       };
     };
-    "@polymer/paper-ripple-3.0.1" = {
+    "@polymer/paper-ripple-3.0.2" = {
       name = "_at_polymer_slash_paper-ripple";
       packageName = "@polymer/paper-ripple";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@polymer/paper-ripple/-/paper-ripple-3.0.1.tgz";
-        sha512 = "dgOe12GyCF1VZBLUQqnzGWlf3xb255FajNCVB1VFj/AtskYtoamnafa7m3a+1vs+C8qbg4Benn5KwgxVDSW4cg==";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@polymer/paper-ripple/-/paper-ripple-3.0.2.tgz";
+        sha512 = "DnLNvYIMsiayeICroYxx6Q6Hg1cUU8HN2sbutXazlemAlGqdq80qz3TIaVdbpbt/pvjcFGX2HtntMlPstCge8Q==";
       };
     };
     "@polymer/paper-spinner-3.0.2" = {
@@ -211,13 +211,13 b' let'
         sha512 = "yiUk09opTEnE1lK+tb501ENb+yQBi4p++Ep0eGJAHesVYKVMPNgPphVKkIizkDaU+n0SE+zXfTsRbYyOMDYXSg==";
       };
     };
-    "@polymer/polymer-3.3.0" = {
+    "@polymer/polymer-3.3.1" = {
       name = "_at_polymer_slash_polymer";
       packageName = "@polymer/polymer";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@polymer/polymer/-/polymer-3.3.0.tgz";
-        sha512 = "rij7suomS7DxdBamnwr/Xa0V5hpypf7I9oYKseF2FWz5Xh2a3wJNpVjgJy1adXVCxqIyPhghsrthnfCt7EblsQ==";
+      version = "3.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@polymer/polymer/-/polymer-3.3.1.tgz";
+        sha512 = "8KaB48tzyMjdsHdxo5KvCAaqmTe7rYDzQAoj/pyEfq9Fp4YfUaS+/xqwYj0GbiDAUNzwkmEQ7dw9cgnRNdKO8A==";
       };
     };
     "@types/clone-0.1.30" = {
@@ -229,13 +229,13 b' let'
         sha1 = "e7365648c1b42136a59c7d5040637b3b5c83b614";
       };
     };
-    "@types/node-6.14.9" = {
+    "@types/node-6.14.10" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "6.14.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-6.14.9.tgz";
-        sha512 = "leP/gxHunuazPdZaCvsCefPQxinqUDsCxCR5xaDUrY2MkYxQRFZZwU5e7GojyYsGB7QVtCi7iVEl/hoFXQYc+w==";
+      version = "6.14.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-6.14.10.tgz";
+        sha512 = "pF4HjZGSog75kGq7B1InK/wt/N08BuPATo+7HRfv7gZUzccebwv/fmWVGs/j6LvSiLWpCuGGhql51M/wcQsNzA==";
       };
     };
     "@types/parse5-2.2.34" = {
@@ -409,22 +409,22 b' let'
         sha512 = "mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA==";
       };
     };
-    "@webcomponents/shadycss-1.9.2" = {
+    "@webcomponents/shadycss-1.9.6" = {
       name = "_at_webcomponents_slash_shadycss";
       packageName = "@webcomponents/shadycss";
-      version = "1.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.9.2.tgz";
-        sha512 = "GsD7RpDVrVdgC6e+D8zQia8RGNmEGQ9/qotnVPQYPrIXhGS5xSt6ZED9YmuHz3HbLqY+E54tE1EK3tjLzSCGrw==";
-      };
-    };
-    "@webcomponents/webcomponentsjs-2.3.0" = {
+      version = "1.9.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.9.6.tgz";
+        sha512 = "5fFjvP0jQJZoXK6YzYeYcIDGJ5oEsdjr1L9VaYLw5yxNd4aRz4srMpwCwldeNG0A6Hvr9igbG7fCsBeiiCXd7A==";
+      };
+    };
+    "@webcomponents/webcomponentsjs-2.4.3" = {
       name = "_at_webcomponents_slash_webcomponentsjs";
       packageName = "@webcomponents/webcomponentsjs";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.3.0.tgz";
-        sha512 = "sR6FOrNnnncRuoJDqq9QxtRsJMbIvASw4vnJwIYKVlKO3AMc+NAr/bIQNnUiTTE9pBDTJkFpVaUdjJaRdsjmyA==";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.4.3.tgz";
+        sha512 = "cV4+sAmshf8ysU2USutrSRYQkJzEYKHsRCGa0CkMElGpG5747VHtkfsW3NdVIBV/m2MDKXTDydT4lkrysH7IFA==";
       };
     };
     "@xtuc/ieee754-1.2.0" = {
@@ -463,13 +463,13 b' let'
         sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
       };
     };
-    "acorn-5.7.3" = {
+    "acorn-5.7.4" = {
       name = "acorn";
       packageName = "acorn";
-      version = "5.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz";
-        sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==";
+      version = "5.7.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz";
+        sha512 = "1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==";
       };
     };
     "acorn-dynamic-import-3.0.0" = {
@@ -499,13 +499,13 b' let'
         sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
       };
     };
-    "ajv-6.10.2" = {
+    "ajv-6.12.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.10.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz";
-        sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==";
+      version = "6.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+        sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
       };
     };
     "ajv-keywords-3.4.1" = {
@@ -860,13 +860,13 b' let'
         sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
       };
     };
-    "aws4-1.8.0" = {
+    "aws4-1.9.1" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz";
-        sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
+      version = "1.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
+        sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==";
       };
     };
     "babel-code-frame-6.26.0" = {
@@ -1445,13 +1445,22 b' let'
         sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
       };
     };
-    "bluebird-3.7.1" = {
+    "bindings-1.5.0" = {
+      name = "bindings";
+      packageName = "bindings";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz";
+        sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==";
+      };
+    };
+    "bluebird-3.7.2" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz";
-        sha512 = "DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==";
+      version = "3.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz";
+        sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==";
       };
     };
     "bn.js-4.11.8" = {
@@ -1580,13 +1589,13 b' let'
         sha512 = "WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==";
       };
     };
-    "buffer-4.9.1" = {
+    "buffer-4.9.2" = {
       name = "buffer";
       packageName = "buffer";
-      version = "4.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
-        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
+      version = "4.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz";
+        sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==";
       };
     };
     "buffer-from-1.1.1" = {
@@ -1670,22 +1679,22 b' let'
         sha1 = "b534e7c734c4f81ec5fbe8aca2ad24354b962c6c";
       };
     };
-    "caniuse-db-1.0.30001006" = {
+    "caniuse-db-1.0.30001042" = {
       name = "caniuse-db";
       packageName = "caniuse-db";
-      version = "1.0.30001006";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001006.tgz";
-        sha512 = "Xn25grc0GXATFnnEX+KP3IwEv6ZdHs4CALyLKvK8pBeeBe+hSpqy3/GyKBgEp4hn6o+bI+GNeNeQBf9PBOK0EQ==";
-      };
-    };
-    "caniuse-lite-1.0.30001006" = {
+      version = "1.0.30001042";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001042.tgz";
+        sha512 = "2RKrB2hkLCW/8Uj32oaXj0O+N9ROo0/BF0EueWHwgs6AeeSiL+rCSsbICR3ayBJOZavgcFx65ZCw7QiafsoUFQ==";
+      };
+    };
+    "caniuse-lite-1.0.30001042" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001006";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001006.tgz";
-        sha512 = "MXnUVX27aGs/QINz+QG1sWSLDr3P1A3Hq5EUWoIt0T7K24DuvMxZEnh3Y5aHlJW6Bz2aApJdSewdYLd8zQnUuw==";
+      version = "1.0.30001042";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001042.tgz";
+        sha512 = "igMQ4dlqnf4tWv0xjaaE02op9AJ2oQzXKjWf4EuAHFN694Uo9/EfPVIPJcmn2WkU9RqozCxx5e2KPcVClHDbDw==";
       };
     };
     "caseless-0.12.0" = {
@@ -1742,13 +1751,13 b' let'
         sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==";
       };
     };
-    "chownr-1.1.3" = {
+    "chownr-1.1.4" = {
       name = "chownr";
       packageName = "chownr";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz";
-        sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
+        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
       };
     };
     "chrome-trace-event-1.0.2" = {
@@ -1787,13 +1796,13 b' let'
         sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
       };
     };
-    "clean-css-4.2.1" = {
+    "clean-css-4.2.3" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz";
-        sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==";
+      version = "4.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz";
+        sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==";
       };
     };
     "cli-1.0.1" = {
@@ -1805,13 +1814,13 b' let'
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "clipboard-2.0.4" = {
+    "clipboard-2.0.6" = {
       name = "clipboard";
       packageName = "clipboard";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz";
-        sha512 = "Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz";
+        sha512 = "g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==";
       };
     };
     "cliui-2.1.0" = {
@@ -2066,13 +2075,13 b' let'
         sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
       };
     };
-    "convert-source-map-1.6.0" = {
+    "convert-source-map-1.7.0" = {
       name = "convert-source-map";
       packageName = "convert-source-map";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz";
-        sha512 = "eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz";
+        sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==";
       };
     };
     "copy-concurrently-1.0.5" = {
@@ -2102,13 +2111,13 b' let'
         sha512 = "Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==";
       };
     };
-    "core-js-2.6.10" = {
+    "core-js-2.6.11" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.6.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz";
-        sha512 = "I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==";
+      version = "2.6.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz";
+        sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -2201,13 +2210,13 b' let'
         sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
       };
     };
-    "css-selector-tokenizer-0.7.1" = {
+    "css-selector-tokenizer-0.7.2" = {
       name = "css-selector-tokenizer";
       packageName = "css-selector-tokenizer";
-      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==";
+      version = "0.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.2.tgz";
+        sha512 = "yj856NGuAymN6r8bn8/Jl46pR+OC3eEvAhfGYDUe7YPtTPAYrSSw4oAniZ9Y8T5B92hjhwTBLUen0/vKPxf6pw==";
       };
     };
     "css-what-2.1.3" = {
@@ -2219,13 +2228,13 b' let'
         sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==";
       };
     };
-    "cssesc-0.1.0" = {
+    "cssesc-3.0.0" = {
       name = "cssesc";
       packageName = "cssesc";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz";
-        sha1 = "c814903e45623371a0477b40109aaafbeeaddbb4";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz";
+        sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==";
       };
     };
     "cssnano-3.10.0" = {
@@ -2390,13 +2399,13 b' let'
         sha512 = "IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==";
       };
     };
-    "des.js-1.0.0" = {
+    "des.js-1.0.1" = {
       name = "des.js";
       packageName = "des.js";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz";
-        sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz";
+        sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==";
       };
     };
     "detect-file-1.0.0" = {
@@ -2444,13 +2453,13 b' let'
         sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==";
       };
     };
-    "dom-serializer-0.2.1" = {
+    "dom-serializer-0.2.2" = {
       name = "dom-serializer";
       packageName = "dom-serializer";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz";
-        sha512 = "sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz";
+        sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==";
       };
     };
     "dom5-2.3.0" = {
@@ -2507,13 +2516,13 b' let'
         sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
       };
     };
-    "dropzone-5.5.1" = {
+    "dropzone-5.7.0" = {
       name = "dropzone";
       packageName = "dropzone";
-      version = "5.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dropzone/-/dropzone-5.5.1.tgz";
-        sha512 = "3VduRWLxx9hbVr42QieQN25mx/I61/mRdUSuxAmDGdDqZIN8qtP7tcKMa3KfpJjuGjOJGYYUzzeq6eGDnkzesA==";
+      version = "5.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dropzone/-/dropzone-5.7.0.tgz";
+        sha512 = "kOltiZXH5cO/72I22JjE+w6BoT6uaVLfWdFMsi1PMKFkU6BZWpqRwjnsRm0o6ANGTBuZar5Piu7m/CbKqRPiYg==";
       };
     };
     "duplexer-0.1.1" = {
@@ -2543,22 +2552,22 b' let'
         sha1 = "3a83a904e54353287874c564b7549386849a98c9";
       };
     };
-    "electron-to-chromium-1.3.302" = {
+    "electron-to-chromium-1.3.412" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.302";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.302.tgz";
-        sha512 = "1qConyiVEbj4xZRBXqtGR003+9tV0rJF0PS6aeO0Ln/UL637js9hdwweCl07meh/kJoI2N4W8q3R3g3F5z46ww==";
-      };
-    };
-    "elliptic-6.5.1" = {
+      version = "1.3.412";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.412.tgz";
+        sha512 = "4bVdSeJScR8fT7ERveLWbxemY5uXEHVseqMRyORosiKcTUSGtVwBkV8uLjXCqoFLeImA57Z9hbz3TOid01U4Hw==";
+      };
+    };
+    "elliptic-6.5.2" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz";
-        sha512 = "xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==";
+      version = "6.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz";
+        sha512 = "f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==";
       };
     };
     "emojis-list-2.1.0" = {
@@ -2570,6 +2579,15 b' let'
         sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
+    "emojis-list-3.0.0" = {
+      name = "emojis-list";
+      packageName = "emojis-list";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz";
+        sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==";
+      };
+    };
     "end-of-stream-1.4.4" = {
       name = "end-of-stream";
       packageName = "end-of-stream";
@@ -2624,22 +2642,22 b' let'
         sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==";
       };
     };
-    "es-abstract-1.16.0" = {
+    "es-abstract-1.17.5" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.16.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz";
-        sha512 = "xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==";
-      };
-    };
-    "es-to-primitive-1.2.0" = {
+      version = "1.17.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz";
+        sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==";
+      };
+    };
+    "es-to-primitive-1.2.1" = {
       name = "es-to-primitive";
       packageName = "es-to-primitive";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
-        sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
+        sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
       };
     };
     "es6-templates-0.2.3" = {
@@ -2741,13 +2759,13 b' let'
         sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
       };
     };
-    "events-3.0.0" = {
+    "events-3.1.0" = {
       name = "events";
       packageName = "events";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-3.0.0.tgz";
-        sha512 = "Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/events/-/events-3.1.0.tgz";
+        sha512 = "Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==";
       };
     };
     "evp_bytestokey-1.0.3" = {
@@ -2849,22 +2867,22 b' let'
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
-    "fast-deep-equal-2.0.1" = {
+    "fast-deep-equal-3.1.1" = {
       name = "fast-deep-equal";
       packageName = "fast-deep-equal";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
-        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
-      };
-    };
-    "fast-json-stable-stringify-2.0.0" = {
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
+        sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==";
+      };
+    };
+    "fast-json-stable-stringify-2.1.0" = {
       name = "fast-json-stable-stringify";
       packageName = "fast-json-stable-stringify";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
-        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
+        sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
       };
     };
     "fastparse-1.1.2" = {
@@ -2912,6 +2930,15 b' let'
         sha1 = "a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b";
       };
     };
+    "file-uri-to-path-1.0.0" = {
+      name = "file-uri-to-path";
+      packageName = "file-uri-to-path";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
+        sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==";
+      };
+    };
     "fill-range-4.0.0" = {
       name = "fill-range";
       packageName = "fill-range";
@@ -3074,13 +3101,13 b' let'
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-1.2.9" = {
+    "fsevents-1.2.12" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.2.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz";
-        sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==";
+      version = "1.2.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz";
+        sha512 = "Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==";
       };
     };
     "function-bind-1.1.1" = {
@@ -3164,13 +3191,13 b' let'
         sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
       };
     };
-    "glob-7.1.5" = {
+    "glob-7.1.6" = {
       name = "glob";
       packageName = "glob";
-      version = "7.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz";
-        sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==";
+      version = "7.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
+        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
       };
     };
     "glob-parent-3.1.0" = {
@@ -3452,13 +3479,13 b' let'
         sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
       };
     };
-    "has-symbols-1.0.0" = {
+    "has-symbols-1.0.1" = {
       name = "has-symbols";
       packageName = "has-symbols";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz";
-        sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
+        sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
       };
     };
     "has-value-0.3.1" = {
@@ -3884,13 +3911,13 b' let'
         sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
       };
     };
-    "is-callable-1.1.4" = {
+    "is-callable-1.1.5" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz";
-        sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz";
+        sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==";
       };
     };
     "is-data-descriptor-0.1.4" = {
@@ -3911,13 +3938,13 b' let'
         sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==";
       };
     };
-    "is-date-object-1.0.1" = {
+    "is-date-object-1.0.2" = {
       name = "is-date-object";
       packageName = "is-date-object";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz";
-        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
+        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
       };
     };
     "is-descriptor-0.1.6" = {
@@ -3965,13 +3992,13 b' let'
         sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
       };
     };
-    "is-finite-1.0.2" = {
+    "is-finite-1.1.0" = {
       name = "is-finite";
       packageName = "is-finite";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
-        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz";
+        sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==";
       };
     };
     "is-fullwidth-code-point-1.0.0" = {
@@ -4037,13 +4064,13 b' let'
         sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==";
       };
     };
-    "is-regex-1.0.4" = {
+    "is-regex-1.0.5" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz";
-        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz";
+        sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==";
       };
     };
     "is-relative-1.0.0" = {
@@ -4073,13 +4100,13 b' let'
         sha1 = "cf61090da0d9efbcab8722deba6f032208dbb0e9";
       };
     };
-    "is-symbol-1.0.2" = {
+    "is-symbol-1.0.3" = {
       name = "is-symbol";
       packageName = "is-symbol";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz";
-        sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
+        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
       };
     };
     "is-typedarray-1.0.0" = {
@@ -4172,13 +4199,13 b' let'
         sha1 = "dd8b74278b27102d29df63eae28308a8cfa1b583";
       };
     };
-    "js-base64-2.5.1" = {
+    "js-base64-2.5.2" = {
       name = "js-base64";
       packageName = "js-base64";
-      version = "2.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz";
-        sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==";
+      version = "2.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz";
+        sha512 = "Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==";
       };
     };
     "js-tokens-3.0.2" = {
@@ -4235,13 +4262,13 b' let'
         sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b";
       };
     };
-    "jshint-2.10.2" = {
+    "jshint-2.11.0" = {
       name = "jshint";
       packageName = "jshint";
-      version = "2.10.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz";
-        sha512 = "e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==";
+      version = "2.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz";
+        sha512 = "ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q==";
       };
     };
     "jshint-2.9.7" = {
@@ -4361,13 +4388,13 b' let'
         sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==";
       };
     };
-    "kind-of-6.0.2" = {
+    "kind-of-6.0.3" = {
       name = "kind-of";
       packageName = "kind-of";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz";
-        sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==";
+      version = "6.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz";
+        sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==";
       };
     };
     "lazy-cache-1.0.4" = {
@@ -4424,13 +4451,13 b' let'
         sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348";
       };
     };
-    "loader-utils-1.2.3" = {
+    "loader-utils-1.4.0" = {
       name = "loader-utils";
       packageName = "loader-utils";
-      version = "1.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz";
-        sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz";
+        sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==";
       };
     };
     "locate-path-2.0.0" = {
@@ -4622,13 +4649,13 b' let'
         sha1 = "180f1f9ebef8b0e638e4166ad52db879beb2ffc5";
       };
     };
-    "math-expression-evaluator-1.2.17" = {
+    "math-expression-evaluator-1.2.22" = {
       name = "math-expression-evaluator";
       packageName = "math-expression-evaluator";
-      version = "1.2.17";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz";
-        sha1 = "de819fdbcd84dccd8fae59c6aeb79615b9d266ac";
+      version = "1.2.22";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.22.tgz";
+        sha512 = "L0j0tFVZBQQLeEjmWOvDLoRciIY8gQGWahvkztXUal8jH8R5Rlqo9GCvgqvXcy9LQhEWdQCVvzqAbxgYNt4blQ==";
       };
     };
     "maxmin-2.1.0" = {
@@ -4703,22 +4730,22 b' let'
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-db-1.40.0" = {
+    "mime-db-1.43.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.40.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
-        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
-      };
-    };
-    "mime-types-2.1.24" = {
+      version = "1.43.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
+        sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==";
+      };
+    };
+    "mime-types-2.1.26" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.24";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
-        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
+      version = "2.1.26";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
+        sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==";
       };
     };
     "mimic-fn-2.1.0" = {
@@ -4775,22 +4802,13 b' let'
         sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
       };
     };
-    "minimist-0.0.8" = {
+    "minimist-1.2.5" = {
       name = "minimist";
       packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-      };
-    };
-    "minimist-1.2.0" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+      version = "1.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
       };
     };
     "mississippi-2.0.0" = {
@@ -4811,13 +4829,13 b' let'
         sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==";
       };
     };
-    "mkdirp-0.5.1" = {
+    "mkdirp-0.5.5" = {
       name = "mkdirp";
       packageName = "mkdirp";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+      version = "0.5.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
+        sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
       };
     };
     "moment-2.24.0" = {
@@ -4829,13 +4847,13 b' let'
         sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==";
       };
     };
-    "mousetrap-1.6.3" = {
+    "mousetrap-1.6.5" = {
       name = "mousetrap";
       packageName = "mousetrap";
-      version = "1.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.3.tgz";
-        sha512 = "bd+nzwhhs9ifsUrC2tWaSgm24/oo2c83zaRyZQF06hYA6sANfsXHtnZ19AbbbDXCDzeH5nZBSQ4NvCjgD62tJA==";
+      version = "1.6.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz";
+        sha512 = "QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==";
       };
     };
     "move-concurrently-1.0.1" = {
@@ -4928,13 +4946,13 b' let'
         sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d";
       };
     };
-    "nopt-4.0.1" = {
+    "nopt-4.0.3" = {
       name = "nopt";
       packageName = "nopt";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
-        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
+        sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
       };
     };
     "noptify-0.0.3" = {
@@ -5045,13 +5063,13 b' let'
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     };
-    "object-inspect-1.6.0" = {
+    "object-inspect-1.7.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz";
-        sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz";
+        sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==";
       };
     };
     "object-keys-1.1.1" = {
@@ -5072,6 +5090,15 b' let'
         sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb";
       };
     };
+    "object.assign-4.1.0" = {
+      name = "object.assign";
+      packageName = "object.assign";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz";
+        sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
+      };
+    };
     "object.defaults-1.1.0" = {
       name = "object.defaults";
       packageName = "object.defaults";
@@ -5081,13 +5108,13 b' let'
         sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf";
       };
     };
-    "object.getownpropertydescriptors-2.0.3" = {
+    "object.getownpropertydescriptors-2.1.0" = {
       name = "object.getownpropertydescriptors";
       packageName = "object.getownpropertydescriptors";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
-        sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
+        sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==";
       };
     };
     "object.map-1.0.1" = {
@@ -5198,13 +5225,13 b' let'
         sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
       };
     };
-    "p-limit-2.2.1" = {
+    "p-limit-2.3.0" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz";
-        sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
+        sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
       };
     };
     "p-locate-2.0.0" = {
@@ -5243,13 +5270,13 b' let'
         sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
       };
     };
-    "pako-1.0.10" = {
+    "pako-1.0.11" = {
       name = "pako";
       packageName = "pako";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz";
-        sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==";
+      version = "1.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz";
+        sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==";
       };
     };
     "parallel-transform-1.2.0" = {
@@ -6035,13 +6062,13 b' let'
         sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
       };
     };
-    "readable-stream-2.3.6" = {
+    "readable-stream-2.3.7" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
-        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+      version = "2.3.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
+        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
       };
     };
     "readdirp-2.2.1" = {
@@ -6098,6 +6125,15 b' let'
         sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==";
       };
     };
+    "regenerate-unicode-properties-8.2.0" = {
+      name = "regenerate-unicode-properties";
+      packageName = "regenerate-unicode-properties";
+      version = "8.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz";
+        sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==";
+      };
+    };
     "regenerator-runtime-0.11.1" = {
       name = "regenerator-runtime";
       packageName = "regenerator-runtime";
@@ -6125,15 +6161,6 b' let'
         sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
       };
     };
-    "regexpu-core-1.0.0" = {
-      name = "regexpu-core";
-      packageName = "regexpu-core";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz";
-        sha1 = "86a763f58ee4d7c2f6b102e4764050de7ed90c6b";
-      };
-    };
     "regexpu-core-2.0.0" = {
       name = "regexpu-core";
       packageName = "regexpu-core";
@@ -6143,6 +6170,15 b' let'
         sha1 = "49d038837b8dcf8bfa5b9a42139938e6ea2ae240";
       };
     };
+    "regexpu-core-4.7.0" = {
+      name = "regexpu-core";
+      packageName = "regexpu-core";
+      version = "4.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz";
+        sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==";
+      };
+    };
     "regjsgen-0.2.0" = {
       name = "regjsgen";
       packageName = "regjsgen";
@@ -6152,6 +6188,15 b' let'
         sha1 = "6c016adeac554f75823fe37ac05b92d5a4edb1f7";
       };
     };
+    "regjsgen-0.5.1" = {
+      name = "regjsgen";
+      packageName = "regjsgen";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz";
+        sha512 = "5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==";
+      };
+    };
     "regjsparser-0.1.5" = {
       name = "regjsparser";
       packageName = "regjsparser";
@@ -6161,6 +6206,15 b' let'
         sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c";
       };
     };
+    "regjsparser-0.6.4" = {
+      name = "regjsparser";
+      packageName = "regjsparser";
+      version = "0.6.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz";
+        sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==";
+      };
+    };
     "relateurl-0.2.7" = {
       name = "relateurl";
       packageName = "relateurl";
@@ -6242,13 +6296,13 b' let'
         sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
       };
     };
-    "resolve-1.12.0" = {
+    "resolve-1.16.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz";
-        sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==";
+      version = "1.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.16.0.tgz";
+        sha512 = "LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA==";
       };
     };
     "resolve-cwd-2.0.0" = {
@@ -6494,13 +6548,13 b' let'
         sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
       };
     };
-    "signal-exit-3.0.2" = {
+    "signal-exit-3.0.3" = {
       name = "signal-exit";
       packageName = "signal-exit";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
+        sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
       };
     };
     "slash-1.0.0" = {
@@ -6611,13 +6665,13 b' let'
         sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
       };
     };
-    "source-map-resolve-0.5.2" = {
+    "source-map-resolve-0.5.3" = {
       name = "source-map-resolve";
       packageName = "source-map-resolve";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
-        sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==";
+      version = "0.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz";
+        sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==";
       };
     };
     "source-map-support-0.4.18" = {
@@ -6719,13 +6773,13 b' let'
         sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==";
       };
     };
-    "stream-shift-1.0.0" = {
+    "stream-shift-1.0.1" = {
       name = "stream-shift";
       packageName = "stream-shift";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz";
-        sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz";
+        sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==";
       };
     };
     "strict-uri-encode-1.1.0" = {
@@ -6755,22 +6809,40 b' let'
         sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
       };
     };
-    "string.prototype.trimleft-2.1.0" = {
+    "string.prototype.trimend-1.0.1" = {
+      name = "string.prototype.trimend";
+      packageName = "string.prototype.trimend";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
+        sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==";
+      };
+    };
+    "string.prototype.trimleft-2.1.2" = {
       name = "string.prototype.trimleft";
       packageName = "string.prototype.trimleft";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz";
-        sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==";
-      };
-    };
-    "string.prototype.trimright-2.1.0" = {
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz";
+        sha512 = "gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==";
+      };
+    };
+    "string.prototype.trimright-2.1.2" = {
       name = "string.prototype.trimright";
       packageName = "string.prototype.trimright";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz";
-        sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz";
+        sha512 = "ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==";
+      };
+    };
+    "string.prototype.trimstart-1.0.1" = {
+      name = "string.prototype.trimstart";
+      packageName = "string.prototype.trimstart";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
+        sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==";
       };
     };
     "string_decoder-0.10.31" = {
@@ -6908,6 +6980,15 b' let'
         sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5";
       };
     };
+    "sweetalert2-9.10.12" = {
+      name = "sweetalert2";
+      packageName = "sweetalert2";
+      version = "9.10.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sweetalert2/-/sweetalert2-9.10.12.tgz";
+        sha512 = "RnarmbDGTPmwecJbaVdq5LvlzbVReIOtPk0huPnXOE19G00xMxGcTY0wjt9AjwsexUnLivLXc3b6nD6+D6NlGg==";
+      };
+    };
     "tapable-0.2.9" = {
       name = "tapable";
       packageName = "tapable";
@@ -7052,13 +7133,13 b' let'
         sha1 = "30c6203e1e66b841a88701ed8858f1725d94b026";
       };
     };
-    "tslib-1.10.0" = {
+    "tslib-1.11.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
-        sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
+      version = "1.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
+        sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==";
       };
     };
     "tty-browserify-0.0.0" = {
@@ -7124,13 +7205,13 b' let'
         sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==";
       };
     };
-    "uglify-js-3.6.7" = {
+    "uglify-js-3.9.1" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.6.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.7.tgz";
-        sha512 = "4sXQDzmdnoXiO+xvmTzQsfIiwrjUCSA95rSP4SEd8tDb51W2TiDOlL76Hl+Kw0Ie42PSItCW8/t6pBNCF2R48A==";
+      version = "3.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz";
+        sha512 = "JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA==";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -7196,6 +7277,42 b' let'
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
+    "unicode-canonical-property-names-ecmascript-1.0.4" = {
+      name = "unicode-canonical-property-names-ecmascript";
+      packageName = "unicode-canonical-property-names-ecmascript";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz";
+        sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==";
+      };
+    };
+    "unicode-match-property-ecmascript-1.0.4" = {
+      name = "unicode-match-property-ecmascript";
+      packageName = "unicode-match-property-ecmascript";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz";
+        sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==";
+      };
+    };
+    "unicode-match-property-value-ecmascript-1.2.0" = {
+      name = "unicode-match-property-value-ecmascript";
+      packageName = "unicode-match-property-value-ecmascript";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz";
+        sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==";
+      };
+    };
+    "unicode-property-aliases-ecmascript-1.1.0" = {
+      name = "unicode-property-aliases-ecmascript";
+      packageName = "unicode-property-aliases-ecmascript";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz";
+        sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==";
+      };
+    };
     "union-value-1.0.1" = {
       name = "union-value";
       packageName = "union-value";
@@ -7358,13 +7475,13 b' let'
         sha1 = "8a16a05d445657a3aea5eecc5b12a4fa5379772c";
       };
     };
-    "uuid-3.3.3" = {
+    "uuid-3.4.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz";
-        sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
+        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
     "v8-compile-cache-2.1.0" = {
@@ -7385,13 +7502,13 b' let'
         sha512 = "amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==";
       };
     };
-    "vendors-1.0.3" = {
+    "vendors-1.0.4" = {
       name = "vendors";
       packageName = "vendors";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz";
-        sha512 = "fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz";
+        sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==";
       };
     };
     "verror-1.10.0" = {
@@ -7403,22 +7520,22 b' let'
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
-    "vm-browserify-1.1.0" = {
+    "vm-browserify-1.1.2" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz";
-        sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==";
-      };
-    };
-    "watchpack-1.6.0" = {
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz";
+        sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==";
+      };
+    };
+    "watchpack-1.6.1" = {
       name = "watchpack";
       packageName = "watchpack";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz";
-        sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz";
+        sha512 = "+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==";
       };
     };
     "waypoints-4.0.1" = {
@@ -7622,27 +7739,27 b' let'
       sources."@polymer/iron-a11y-keys-3.0.1"
       sources."@polymer/iron-a11y-keys-behavior-3.0.1"
       sources."@polymer/iron-ajax-3.0.1"
-      sources."@polymer/iron-autogrow-textarea-3.0.1"
+      sources."@polymer/iron-autogrow-textarea-3.0.3"
       sources."@polymer/iron-behaviors-3.0.1"
       sources."@polymer/iron-checked-element-behavior-3.0.1"
-      sources."@polymer/iron-fit-behavior-3.0.1"
+      sources."@polymer/iron-fit-behavior-3.0.2"
       sources."@polymer/iron-flex-layout-3.0.1"
       sources."@polymer/iron-form-element-behavior-3.0.1"
       sources."@polymer/iron-meta-3.0.1"
-      sources."@polymer/iron-overlay-behavior-3.0.2"
+      sources."@polymer/iron-overlay-behavior-3.0.3"
       sources."@polymer/iron-resizable-behavior-3.0.1"
       sources."@polymer/iron-validatable-behavior-3.0.1"
       sources."@polymer/paper-behaviors-3.0.1"
       sources."@polymer/paper-button-3.0.1"
-      sources."@polymer/paper-ripple-3.0.1"
+      sources."@polymer/paper-ripple-3.0.2"
       sources."@polymer/paper-spinner-3.0.2"
       sources."@polymer/paper-styles-3.0.1"
       sources."@polymer/paper-toast-3.0.1"
       sources."@polymer/paper-toggle-button-3.0.1"
       sources."@polymer/paper-tooltip-3.0.1"
-      sources."@polymer/polymer-3.3.0"
+      sources."@polymer/polymer-3.3.1"
       sources."@types/clone-0.1.30"
-      sources."@types/node-6.14.9"
+      sources."@types/node-6.14.10"
       sources."@types/parse5-2.2.34"
       sources."@webassemblyjs/ast-1.7.10"
       sources."@webassemblyjs/floating-point-hex-parser-1.7.10"
@@ -7662,12 +7779,12 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.9.2"
-      sources."@webcomponents/webcomponentsjs-2.3.0"
+      sources."@webcomponents/shadycss-1.9.6"
+      sources."@webcomponents/webcomponentsjs-2.4.3"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.1"
       sources."abbrev-1.1.1"
-      sources."acorn-5.7.3"
+      sources."acorn-5.7.4"
       sources."acorn-dynamic-import-3.0.0"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
@@ -7727,7 +7844,7 b' let'
         ];
       })
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.8.0"
+      sources."aws4-1.9.1"
       (sources."babel-code-frame-6.26.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -7841,7 +7958,8 b' let'
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
       sources."binary-extensions-1.13.1"
-      sources."bluebird-3.7.1"
+      sources."bindings-1.5.0"
+      sources."bluebird-3.7.2"
       sources."bn.js-4.11.8"
       sources."boolbase-1.0.0"
       sources."boom-2.10.1"
@@ -7859,13 +7977,13 b' let'
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
       sources."browserslist-3.2.8"
-      sources."buffer-4.9.1"
+      sources."buffer-4.9.2"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
       (sources."cacache-10.0.4" // {
         dependencies = [
-          sources."glob-7.1.5"
+          sources."glob-7.1.6"
           sources."graceful-fs-4.2.3"
           sources."lru-cache-4.1.5"
           sources."minimatch-3.0.4"
@@ -7880,8 +7998,8 b' let'
           sources."browserslist-1.7.7"
         ];
       })
-      sources."caniuse-db-1.0.30001006"
-      sources."caniuse-lite-1.0.30001006"
+      sources."caniuse-db-1.0.30001042"
+      sources."caniuse-lite-1.0.30001042"
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
       sources."chalk-0.5.1"
@@ -7890,7 +8008,7 b' let'
           sources."is-glob-4.0.1"
         ];
       })
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."chrome-trace-event-1.0.2"
       sources."cipher-base-1.0.4"
       (sources."clap-1.2.3" // {
@@ -7920,18 +8038,18 b' let'
           sources."kind-of-5.1.0"
         ];
       })
-      (sources."clean-css-4.2.1" // {
+      (sources."clean-css-4.2.3" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
       (sources."cli-1.0.1" // {
         dependencies = [
-          sources."glob-7.1.5"
+          sources."glob-7.1.6"
           sources."minimatch-3.0.4"
         ];
       })
-      sources."clipboard-2.0.4"
+      sources."clipboard-2.0.6"
       (sources."cliui-4.1.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -7957,21 +8075,21 b' let'
       sources."concat-map-0.0.1"
       (sources."concat-stream-1.6.2" // {
         dependencies = [
-          sources."readable-stream-2.3.6"
+          sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
-      (sources."convert-source-map-1.6.0" // {
+      (sources."convert-source-map-1.7.0" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
         ];
       })
       (sources."copy-concurrently-1.0.5" // {
         dependencies = [
-          sources."glob-7.1.5"
+          sources."glob-7.1.6"
           sources."minimatch-3.0.4"
           sources."rimraf-2.7.1"
         ];
@@ -7983,7 +8101,7 b' let'
           sources."minimatch-3.0.4"
         ];
       })
-      sources."core-js-2.6.10"
+      sources."core-js-2.6.11"
       sources."core-util-is-1.0.2"
       sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
@@ -7998,13 +8116,16 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.1" // {
-        dependencies = [
-          sources."regexpu-core-1.0.0"
+      (sources."css-selector-tokenizer-0.7.2" // {
+        dependencies = [
+          sources."jsesc-0.5.0"
+          sources."regexpu-core-4.7.0"
+          sources."regjsgen-0.5.1"
+          sources."regjsparser-0.6.4"
         ];
       })
       sources."css-what-2.1.3"
-      sources."cssesc-0.1.0"
+      sources."cssesc-3.0.0"
       sources."cssnano-3.10.0"
       sources."csso-2.3.2"
       sources."cyclist-1.0.1"
@@ -8024,13 +8145,13 b' let'
       sources."defined-1.0.0"
       sources."delayed-stream-1.0.0"
       sources."delegate-3.2.0"
-      sources."des.js-1.0.0"
+      sources."des.js-1.0.1"
       sources."detect-file-1.0.0"
       sources."detect-indent-4.0.0"
       sources."diffie-hellman-5.0.3"
       sources."dir-glob-2.2.2"
       sources."dom-converter-0.2.0"
-      (sources."dom-serializer-0.2.1" // {
+      (sources."dom-serializer-0.2.2" // {
         dependencies = [
           sources."domelementtype-2.0.1"
           sources."entities-2.0.0"
@@ -8046,33 +8167,33 b' let'
       sources."domelementtype-1.3.1"
       sources."domhandler-2.3.0"
       sources."domutils-1.5.1"
-      sources."dropzone-5.5.1"
+      sources."dropzone-5.7.0"
       sources."duplexer-0.1.1"
       (sources."duplexify-3.7.1" // {
         dependencies = [
-          sources."readable-stream-2.3.6"
+          sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.302"
-      sources."elliptic-6.5.1"
-      sources."emojis-list-2.1.0"
+      sources."electron-to-chromium-1.3.412"
+      sources."elliptic-6.5.2"
+      sources."emojis-list-3.0.0"
       sources."end-of-stream-1.4.4"
       (sources."enhanced-resolve-4.1.1" // {
         dependencies = [
           sources."graceful-fs-4.2.3"
           sources."memory-fs-0.5.0"
-          sources."readable-stream-2.3.6"
+          sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
       sources."entities-1.0.0"
       sources."errno-0.1.7"
-      sources."es-abstract-1.16.0"
-      sources."es-to-primitive-1.2.0"
+      sources."es-abstract-1.17.5"
+      sources."es-to-primitive-1.2.1"
       sources."es6-templates-0.2.3"
       sources."escape-string-regexp-1.0.5"
       sources."eslint-scope-4.0.3"
@@ -8082,7 +8203,7 b' let'
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."eventemitter2-0.4.14"
-      sources."events-3.0.0"
+      sources."events-3.1.0"
       sources."evp_bytestokey-1.0.3"
       sources."execa-1.0.0"
       sources."exit-0.1.2"
@@ -8119,13 +8240,14 b' let'
         ];
       })
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-2.0.1"
-      sources."fast-json-stable-stringify-2.0.0"
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-json-stable-stringify-2.1.0"
       sources."fastparse-1.1.2"
       sources."favico.js-0.3.10"
       sources."faye-websocket-0.4.4"
       sources."figures-1.7.0"
       sources."file-sync-cmp-0.1.1"
+      sources."file-uri-to-path-1.0.0"
       (sources."fill-range-4.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -8145,7 +8267,7 b' let'
       sources."flatten-1.0.3"
       (sources."flush-write-stream-1.1.1" // {
         dependencies = [
-          sources."readable-stream-2.3.6"
+          sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
@@ -8157,7 +8279,7 b' let'
       sources."fragment-cache-0.2.1"
       (sources."from2-2.3.0" // {
         dependencies = [
-          sources."readable-stream-2.3.6"
+          sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
@@ -8168,7 +8290,7 b' let'
         ];
       })
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.9"
+      sources."fsevents-1.2.12"
       sources."function-bind-1.1.1"
       sources."gaze-0.5.2"
       sources."get-caller-file-1.0.3"
@@ -8200,7 +8322,7 b' let'
       sources."globals-9.18.0"
       (sources."globby-7.1.1" // {
         dependencies = [
-          sources."glob-7.1.5"
+          sources."glob-7.1.6"
           sources."minimatch-3.0.4"
         ];
       })
@@ -8214,7 +8336,7 b' let'
       sources."grunt-0.4.5"
       (sources."grunt-cli-1.3.2" // {
         dependencies = [
-          sources."nopt-4.0.1"
+          sources."nopt-4.0.3"
         ];
       })
       (sources."grunt-contrib-concat-0.5.1" // {
@@ -8289,7 +8411,7 b' let'
       sources."has-1.0.3"
       sources."has-ansi-0.1.0"
       sources."has-flag-3.0.0"
-      sources."has-symbols-1.0.0"
+      sources."has-symbols-1.0.1"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -8321,6 +8443,7 b' let'
       (sources."html-webpack-plugin-3.2.0" // {
         dependencies = [
           sources."big.js-3.2.0"
+          sources."emojis-list-2.1.0"
           sources."json5-0.5.1"
           sources."loader-utils-0.2.17"
           sources."lodash-4.17.15"
@@ -8348,7 +8471,7 b' let'
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
-          sources."p-limit-2.2.1"
+          sources."p-limit-2.3.0"
           sources."p-locate-3.0.0"
           sources."p-try-2.2.0"
           sources."pkg-dir-3.0.0"
@@ -8368,13 +8491,13 b' let'
       sources."is-accessor-descriptor-1.0.0"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.1.4"
+      sources."is-callable-1.1.5"
       sources."is-data-descriptor-1.0.0"
-      sources."is-date-object-1.0.1"
+      sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
-      sources."is-finite-1.0.2"
+      sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-glob-3.1.0"
       (sources."is-number-3.0.0" // {
@@ -8384,11 +8507,11 b' let'
       })
       sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
-      sources."is-regex-1.0.4"
+      sources."is-regex-1.0.5"
       sources."is-relative-1.0.0"
       sources."is-stream-1.1.0"
       sources."is-svg-2.1.0"
-      sources."is-symbol-1.0.2"
+      sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."is-unc-path-1.0.0"
       sources."is-windows-1.0.2"
@@ -8397,12 +8520,12 b' let'
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
       sources."jquery-1.11.3"
-      sources."js-base64-2.5.1"
+      sources."js-base64-2.5.2"
       sources."js-tokens-3.0.2"
       sources."js-yaml-2.0.5"
       sources."jsbn-0.1.1"
       sources."jsesc-1.3.0"
-      (sources."jshint-2.10.2" // {
+      (sources."jshint-2.11.0" // {
         dependencies = [
           sources."lodash-4.17.15"
           sources."minimatch-3.0.4"
@@ -8420,7 +8543,7 b' let'
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."kind-of-6.0.2"
+      sources."kind-of-6.0.3"
       sources."lazy-cache-1.0.4"
       sources."lcid-2.0.0"
       (sources."less-2.7.3" // {
@@ -8434,7 +8557,7 b' let'
         ];
       })
       sources."loader-runner-2.4.0"
-      sources."loader-utils-1.2.3"
+      sources."loader-utils-1.4.0"
       sources."locate-path-2.0.0"
       sources."lodash-0.9.2"
       sources."lodash.camelcase-4.3.0"
@@ -8451,7 +8574,7 b' let'
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."mark.js-8.11.1"
-      sources."math-expression-evaluator-1.2.17"
+      sources."math-expression-evaluator-1.2.22"
       (sources."maxmin-2.1.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -8466,7 +8589,7 b' let'
       sources."mem-4.3.0"
       (sources."memory-fs-0.4.1" // {
         dependencies = [
-          sources."readable-stream-2.3.6"
+          sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
@@ -8474,29 +8597,25 b' let'
       sources."micromatch-3.1.10"
       sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
-      sources."mime-db-1.40.0"
-      sources."mime-types-2.1.24"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
       sources."mimic-fn-2.1.0"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-0.2.14"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."mississippi-2.0.0"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.5"
       sources."moment-2.24.0"
-      sources."mousetrap-1.6.3"
+      sources."mousetrap-1.6.5"
       (sources."move-concurrently-1.0.1" // {
         dependencies = [
-          sources."glob-7.1.5"
+          sources."glob-7.1.6"
           sources."minimatch-3.0.4"
           sources."rimraf-2.7.1"
         ];
@@ -8509,7 +8628,7 b' let'
       sources."no-case-2.3.2"
       (sources."node-libs-browser-2.2.1" // {
         dependencies = [
-          (sources."readable-stream-2.3.6" // {
+          (sources."readable-stream-2.3.7" // {
             dependencies = [
               sources."string_decoder-1.1.1"
             ];
@@ -8550,11 +8669,12 b' let'
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.6.0"
+      sources."object-inspect-1.7.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
+      sources."object.assign-4.1.0"
       sources."object.defaults-1.1.0"
-      sources."object.getownpropertydescriptors-2.0.3"
+      sources."object.getownpropertydescriptors-2.1.0"
       sources."object.map-1.0.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
@@ -8569,10 +8689,10 b' let'
       sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
-      sources."pako-1.0.10"
+      sources."pako-1.0.11"
       (sources."parallel-transform-1.2.0" // {
         dependencies = [
-          sources."readable-stream-2.3.6"
+          sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
@@ -8729,7 +8849,7 b' let'
       (sources."readdirp-2.2.1" // {
         dependencies = [
           sources."graceful-fs-4.2.3"
-          sources."readable-stream-2.3.6"
+          sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
@@ -8747,6 +8867,7 b' let'
       })
       sources."reduce-function-call-1.0.3"
       sources."regenerate-1.4.0"
+      sources."regenerate-unicode-properties-8.2.0"
       sources."regenerator-runtime-0.11.1"
       sources."regenerator-transform-0.10.1"
       sources."regex-not-1.0.2"
@@ -8771,7 +8892,7 b' let'
       sources."request-2.81.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."resolve-1.12.0"
+      sources."resolve-1.16.0"
       sources."resolve-cwd-2.0.0"
       sources."resolve-dir-1.0.1"
       sources."resolve-from-3.0.0"
@@ -8787,7 +8908,7 b' let'
       sources."sax-1.2.4"
       (sources."schema-utils-0.4.7" // {
         dependencies = [
-          sources."ajv-6.10.2"
+          sources."ajv-6.12.0"
         ];
       })
       sources."select-1.1.2"
@@ -8805,7 +8926,7 b' let'
       sources."shebang-regex-1.0.0"
       sources."shelljs-0.3.0"
       sources."sigmund-1.0.1"
-      sources."signal-exit-3.0.2"
+      sources."signal-exit-3.0.3"
       sources."slash-1.0.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
@@ -8839,7 +8960,7 b' let'
       sources."sort-keys-1.1.2"
       sources."source-list-map-2.0.1"
       sources."source-map-0.5.7"
-      sources."source-map-resolve-0.5.2"
+      sources."source-map-resolve-0.5.3"
       sources."source-map-support-0.4.18"
       sources."source-map-url-0.4.0"
       sources."split-string-3.1.0"
@@ -8870,7 +8991,7 b' let'
       sources."sticky-sidebar-3.3.1"
       (sources."stream-browserify-2.0.2" // {
         dependencies = [
-          sources."readable-stream-2.3.6"
+          sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
@@ -8878,12 +8999,12 b' let'
       sources."stream-each-1.2.3"
       (sources."stream-http-2.8.3" // {
         dependencies = [
-          sources."readable-stream-2.3.6"
+          sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."stream-shift-1.0.0"
+      sources."stream-shift-1.0.1"
       sources."strict-uri-encode-1.1.0"
       (sources."string-width-2.1.1" // {
         dependencies = [
@@ -8892,8 +9013,10 b' let'
           sources."strip-ansi-4.0.0"
         ];
       })
-      sources."string.prototype.trimleft-2.1.0"
-      sources."string.prototype.trimright-2.1.0"
+      sources."string.prototype.trimend-1.0.1"
+      sources."string.prototype.trimleft-2.1.2"
+      sources."string.prototype.trimright-2.1.2"
+      sources."string.prototype.trimstart-1.0.1"
       sources."string_decoder-0.10.31"
       sources."stringstream-0.0.6"
       sources."strip-ansi-0.3.0"
@@ -8909,11 +9032,12 b' let'
           sources."js-yaml-3.7.0"
         ];
       })
+      sources."sweetalert2-9.10.12"
       sources."tapable-1.1.3"
       sources."through-2.3.8"
       (sources."through2-2.0.5" // {
         dependencies = [
-          sources."readable-stream-2.3.6"
+          sources."readable-stream-2.3.7"
           sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
@@ -8942,6 +9066,7 b' let'
         dependencies = [
           sources."big.js-3.2.0"
           sources."colors-1.4.0"
+          sources."emojis-list-2.1.0"
           sources."enhanced-resolve-3.4.1"
           sources."graceful-fs-4.2.3"
           sources."json5-0.5.1"
@@ -8949,7 +9074,7 b' let'
           sources."tapable-0.2.9"
         ];
       })
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.1"
       sources."tty-browserify-0.0.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -8960,11 +9085,7 b' let'
           sources."source-map-0.6.1"
         ];
       })
-      (sources."uglify-js-3.6.7" // {
-        dependencies = [
-          sources."source-map-0.6.1"
-        ];
-      })
+      sources."uglify-js-3.9.1"
       sources."uglify-to-browserify-1.0.2"
       (sources."uglifyjs-webpack-plugin-1.3.0" // {
         dependencies = [
@@ -8974,6 +9095,10 b' let'
       sources."unc-path-regex-0.1.2"
       sources."underscore-1.7.0"
       sources."underscore.string-2.2.1"
+      sources."unicode-canonical-property-names-ecmascript-1.0.4"
+      sources."unicode-match-property-ecmascript-1.0.4"
+      sources."unicode-match-property-value-ecmascript-1.2.0"
+      sources."unicode-property-aliases-ecmascript-1.1.0"
       sources."union-value-1.0.1"
       sources."uniq-1.0.1"
       sources."uniqs-2.0.0"
@@ -9012,17 +9137,17 b' let'
       sources."util-deprecate-1.0.2"
       sources."util.promisify-1.0.0"
       sources."utila-0.4.0"
-      sources."uuid-3.3.3"
+      sources."uuid-3.4.0"
       sources."v8-compile-cache-2.1.0"
       sources."v8flags-3.1.3"
-      sources."vendors-1.0.3"
+      sources."vendors-1.0.4"
       (sources."verror-1.10.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."vm-browserify-1.1.0"
-      (sources."watchpack-1.6.0" // {
+      sources."vm-browserify-1.1.2"
+      (sources."watchpack-1.6.1" // {
         dependencies = [
           sources."graceful-fs-4.2.3"
         ];
@@ -9030,7 +9155,7 b' let'
       sources."waypoints-4.0.1"
       (sources."webpack-4.23.1" // {
         dependencies = [
-          sources."ajv-6.10.2"
+          sources."ajv-6.12.0"
         ];
       })
       (sources."webpack-cli-3.1.2" // {
@@ -9086,7 +9211,7 b' let'
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
-          sources."p-limit-2.2.1"
+          sources."p-limit-2.3.0"
           sources."p-locate-3.0.0"
           sources."p-try-2.2.0"
         ];

pkgs/python-packages.nix

@@ -5,7 +5,7 b''
 
 self: super: {
   "alembic" = super.buildPythonPackage {
-    name = "alembic-1.3.1";
+    name = "alembic-1.4.2";
     doCheck = false;
     propagatedBuildInputs = [
       self."sqlalchemy"
@@ -14,8 +14,8 b' self: super: {'
       self."python-dateutil"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/84/64/493c45119dce700a4b9eeecc436ef9e8835ab67bae6414f040cdc7b58f4b/alembic-1.3.1.tar.gz";
-      sha256 = "1cl2chk5jx0rf4hmsd5lljic7iifw17yv3y5xawvp4i14jvpn9s9";
+      url = "https://files.pythonhosted.org/packages/60/1e/cabc75a189de0fbb2841d0975243e59bde8b7822bacbb95008ac6fe9ad47/alembic-1.4.2.tar.gz";
+      sha256 = "1gsdrzx9h7wfva200qvvsc9sn4w79mk2vs0bbnzjhxi1jw2b0nh3";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -146,15 +146,15 b' self: super: {'
     };
   };
   "bleach" = super.buildPythonPackage {
-    name = "bleach-3.1.0";
+    name = "bleach-3.1.3";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
       self."webencodings"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/78/5a/0df03e8735cd9c75167528299c738702437589b9c71a849489d00ffa82e8/bleach-3.1.0.tar.gz";
-      sha256 = "1yhrgrhkln8bd6gn3imj69g1h4xqah9gaz9q26crqr6gmmvpzprz";
+      url = "https://files.pythonhosted.org/packages/de/09/5267f8577a92487ed43bc694476c4629c6eca2e3c93fcf690a26bfe39e1d/bleach-3.1.3.tar.gz";
+      sha256 = "0al437aw4p2xp83az5hhlrp913nsf0cg6kg4qj3fjhv4wakxipzq";
     };
     meta = {
       license = [ pkgs.lib.licenses.asl20 ];
@@ -171,6 +171,17 b' self: super: {'
       license = [ pkgs.lib.licenses.mit ];
     };
   };
+  "cachetools" = super.buildPythonPackage {
+    name = "cachetools-3.1.1";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/ae/37/7fd45996b19200e0cb2027a0b6bef4636951c4ea111bfad36c71287247f6/cachetools-3.1.1.tar.gz";
+      sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
   "celery" = super.buildPythonPackage {
     name = "celery-4.3.0";
     doCheck = false;
@@ -189,11 +200,11 b' self: super: {'
     };
   };
   "certifi" = super.buildPythonPackage {
-    name = "certifi-2019.11.28";
+    name = "certifi-2020.4.5.1";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/41/bf/9d214a5af07debc6acf7f3f257265618f1db242a3f8e49a9b516f24523a6/certifi-2019.11.28.tar.gz";
-      sha256 = "07qg6864bk4qxa8akr967amlmsq9v310hp039mcpjx6dliylrdi5";
+      url = "https://files.pythonhosted.org/packages/b8/e2/a3a86a67c3fc8249ed305fc7b7d290ebe5e4d46ad45573884761ef4dea7b/certifi-2020.4.5.1.tar.gz";
+      sha256 = "06b5gfs7wmmipln8f3z928d2mmx2j4b3x7pnqmj6cvmyfh8v7z2i";
     };
     meta = {
       license = [ pkgs.lib.licenses.mpl20 { fullName = "Mozilla Public License 2.0 (MPL 2.0)"; } ];
@@ -372,6 +383,17 b' self: super: {'
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
+  "cssutils" = super.buildPythonPackage {
+    name = "cssutils-1.0.2";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/5c/0b/c5f29d29c037e97043770b5e7c740b6252993e4b57f029b3cd03c78ddfec/cssutils-1.0.2.tar.gz";
+      sha256 = "1bxchrbqzapwijap0yhlxdil1w9bmwvgx77aizlkhc2mcxjg1z52";
+    };
+    meta = {
+      license = [ { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL 2.1 or later, see also http://cthedot.de/cssutils/"; } ];
+    };
+  };
   "decorator" = super.buildPythonPackage {
     name = "decorator-4.1.2";
     doCheck = false;
@@ -429,11 +451,11 b' self: super: {'
     };
   };
   "docutils" = super.buildPythonPackage {
-    name = "docutils-0.14";
+    name = "docutils-0.16";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-0.14.tar.gz";
-      sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
+      url = "https://files.pythonhosted.org/packages/2f/e0/3d435b34abd2d62e8206171892f174b180cd37b09d57b924ca5c2ef2219d/docutils-0.16.tar.gz";
+      sha256 = "1z3qliszqca9m719q3qhdkh0ghh90g500avzdgi7pl77x5h3mpn2";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.publicDomain pkgs.lib.licenses.gpl1 { fullName = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)"; } pkgs.lib.licenses.psfl ];
@@ -565,11 +587,11 b' self: super: {'
     };
   };
   "enum34" = super.buildPythonPackage {
-    name = "enum34-1.1.6";
+    name = "enum34-1.1.10";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz";
-      sha256 = "1cgm5ng2gcfrkrm3hc22brl6chdmv67b9zvva9sfs7gn7dwc9n4a";
+      url = "https://files.pythonhosted.org/packages/11/c4/2da1f4952ba476677a42f25cd32ab8aaf0e1c0d0e00b89822b835c7e654c/enum34-1.1.10.tar.gz";
+      sha256 = "0j7ji699fwswm4vg6w1v07fkbf8dkzdm6gfh88jvs5nqgr3sgrnc";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -631,14 +653,14 b' self: super: {'
     };
   };
   "gevent" = super.buildPythonPackage {
-    name = "gevent-1.4.0";
+    name = "gevent-1.5.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."greenlet"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/ed/27/6c49b70808f569b66ec7fac2e78f076e9b204db9cf5768740cff3d5a07ae/gevent-1.4.0.tar.gz";
-      sha256 = "1lchr4akw2jkm5v4kz7bdm4wv3knkfhbfn9vkkz4s5yrkcxzmdqy";
+      url = "https://files.pythonhosted.org/packages/5a/79/2c63d385d017b5dd7d70983a463dfd25befae70c824fedb857df6e72eff2/gevent-1.5.0.tar.gz";
+      sha256 = "0aac3d4vhv5n4rsb6cqzq0d1xx9immqz4fmpddw35yxkwdc450dj";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -689,11 +711,11 b' self: super: {'
     };
   };
   "hupper" = super.buildPythonPackage {
-    name = "hupper-1.9.1";
+    name = "hupper-1.10.2";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/09/3a/4f215659f31eeffe364a984dba486bfa3907bfcc54b7013bdfe825cebb5f/hupper-1.9.1.tar.gz";
-      sha256 = "0pyg879fv9mbwlnbzw2a3234qqycqs9l97h5mpkmk0bvxhi2471v";
+      url = "https://files.pythonhosted.org/packages/41/24/ea90fef04706e54bd1635c05c50dc9cf87cda543c59303a03e7aa7dda0ce/hupper-1.10.2.tar.gz";
+      sha256 = "0am0p6g5cz6xmcaf04xq8q6dzdd9qz0phj6gcmpsckf2mcyza61q";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -711,17 +733,17 b' self: super: {'
     };
   };
   "importlib-metadata" = super.buildPythonPackage {
-    name = "importlib-metadata-0.23";
+    name = "importlib-metadata-1.6.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."zipp"
+      self."pathlib2"
       self."contextlib2"
       self."configparser"
-      self."pathlib2"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/5d/44/636bcd15697791943e2dedda0dbe098d8530a38d113b202817133e0b06c0/importlib_metadata-0.23.tar.gz";
-      sha256 = "09mdqdfv5rdrwz80jh9m379gxmvk2vhjfz0fg53hid00icvxf65a";
+      url = "https://files.pythonhosted.org/packages/b4/1b/baab42e3cd64c9d5caac25a9d6c054f8324cdc38975a44d600569f1f7158/importlib_metadata-1.6.0.tar.gz";
+      sha256 = "07icyggasn38yv2swdrd8z6i0plazmc9adavsdkbqqj91j53ll9l";
     };
     meta = {
       license = [ pkgs.lib.licenses.asl20 ];
@@ -765,15 +787,15 b' self: super: {'
     };
   };
   "ipdb" = super.buildPythonPackage {
-    name = "ipdb-0.12";
+    name = "ipdb-0.13.2";
     doCheck = false;
     propagatedBuildInputs = [
       self."setuptools"
       self."ipython"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/6d/43/c3c2e866a8803e196d6209595020a4a6db1a3c5d07c01455669497ae23d0/ipdb-0.12.tar.gz";
-      sha256 = "1khr2n7xfy8hg65kj1bsrjq9g7656pp0ybfa8abpbzpdawji3qnw";
+      url = "https://files.pythonhosted.org/packages/2c/bb/a3e1a441719ebd75c6dac8170d3ddba884b7ee8a5c0f9aefa7297386627a/ipdb-0.13.2.tar.gz";
+      sha256 = "0jcd849rx30y3wcgzsqbn06v0yjlzvb9x3076q0yxpycdwm1ryvp";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1074,15 +1096,15 b' self: super: {'
     };
   };
   "packaging" = super.buildPythonPackage {
-    name = "packaging-19.2";
+    name = "packaging-20.3";
     doCheck = false;
     propagatedBuildInputs = [
       self."pyparsing"
       self."six"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/5a/2f/449ded84226d0e2fda8da9252e5ee7731bdf14cd338f622dfcd9934e0377/packaging-19.2.tar.gz";
-      sha256 = "0izwlz9h0bw171a1chr311g2y7n657zjaf4mq4rgm8pp9lbj9f98";
+      url = "https://files.pythonhosted.org/packages/65/37/83e3f492eb52d771e2820e88105f605335553fe10422cba9d256faeb1702/packaging-20.3.tar.gz";
+      sha256 = "18xpablq278janh03bai9xd4kz9b0yfp6vflazn725ns9x3jna9w";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal { fullName = "BSD or Apache License, Version 2.0"; } pkgs.lib.licenses.asl20 ];
@@ -1100,25 +1122,25 b' self: super: {'
     };
   };
   "paste" = super.buildPythonPackage {
-    name = "paste-3.2.1";
+    name = "paste-3.4.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/0d/86/7008b5563594e8a63763f05212a3eb84c85f0b2eff834e5697716e56bca9/Paste-3.2.1.tar.gz";
-      sha256 = "1vjxr8n1p31c9x9rh8g0f34yisa9028cxpvn36q7g1s0m2b9x71x";
+      url = "https://files.pythonhosted.org/packages/79/4a/45821b71dd40000507549afd1491546afad8279c0a87527c88776a794158/Paste-3.4.0.tar.gz";
+      sha256 = "16sichvhyci1gaarkjs35mai8vphh7b244qm14hj1isw38nx4c03";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   "pastedeploy" = super.buildPythonPackage {
-    name = "pastedeploy-2.0.1";
+    name = "pastedeploy-2.1.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/19/a0/5623701df7e2478a68a1b685d1a84518024eef994cde7e4da8449a31616f/PasteDeploy-2.0.1.tar.gz";
-      sha256 = "02imfbbx1mi2h546f3sr37m47dk9qizaqhzzlhx8bkzxa6fzn8yl";
+      url = "https://files.pythonhosted.org/packages/c4/e9/972a1c20318b3ae9edcab11a6cef64308fbae5d0d45ab52c6f8b2b8f35b8/PasteDeploy-2.1.0.tar.gz";
+      sha256 = "16qsq5y6mryslmbp5pn35x4z8z3ndp5rpgl42h226879nrw9hmg7";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1167,14 +1189,14 b' self: super: {'
     };
   };
   "pexpect" = super.buildPythonPackage {
-    name = "pexpect-4.7.0";
+    name = "pexpect-4.8.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."ptyprocess"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/1c/b1/362a0d4235496cb42c33d1d8732b5e2c607b0129ad5fdd76f5a583b9fcb3/pexpect-4.7.0.tar.gz";
-      sha256 = "1sv2rri15zwhds85a4kamwh9pj49qcxv7m4miyr4jfpfwv81yb4y";
+      url = "https://files.pythonhosted.org/packages/e5/9b/ff402e0e930e70467a7178abb7c128709a30dfb22d8777c043e501bc1b10/pexpect-4.8.0.tar.gz";
+      sha256 = "032cg337h8awydgypz6f4wx848lw8dyrj4zy988x0lyib4ws8rgw";
     };
     meta = {
       license = [ pkgs.lib.licenses.isc { fullName = "ISC License (ISCL)"; } ];
@@ -1237,6 +1259,24 b' self: super: {'
       license = [ pkgs.lib.licenses.mit ];
     };
   };
+  "premailer" = super.buildPythonPackage {
+    name = "premailer-3.6.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."lxml"
+      self."cssselect"
+      self."cssutils"
+      self."requests"
+      self."cachetools"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/62/da/2f43cdf9d3d79c80c4856a12389a1f257d65fe9ccc44bc6b4383c8a18e33/premailer-3.6.1.tar.gz";
+      sha256 = "08pshx7a110k4ll20x0xhpvyn3kkipkrbgxjjn7ncdxs54ihdhgw";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.psfl { fullName = "Python"; } ];
+    };
+  };
   "prompt-toolkit" = super.buildPythonPackage {
     name = "prompt-toolkit-1.0.18";
     doCheck = false;
@@ -1253,11 +1293,11 b' self: super: {'
     };
   };
   "psutil" = super.buildPythonPackage {
-    name = "psutil-5.6.5";
+    name = "psutil-5.7.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/03/9a/95c4b3d0424426e5fd94b5302ff74cea44d5d4f53466e1228ac8e73e14b4/psutil-5.6.5.tar.gz";
-      sha256 = "0isil5jxwwd8awz54qk28rpgjg43i5l6yl70g40vxwa4r4m56lfh";
+      url = "https://files.pythonhosted.org/packages/c4/b8/3512f0e93e0db23a71d82485ba256071ebef99b227351f0f5540f744af41/psutil-5.7.0.tar.gz";
+      sha256 = "03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1348,11 +1388,11 b' self: super: {'
     };
   };
   "pycparser" = super.buildPythonPackage {
-    name = "pycparser-2.19";
+    name = "pycparser-2.20";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/68/9e/49196946aee219aead1290e00d1e7fdeab8567783e83e1b9ab5585e6206a/pycparser-2.19.tar.gz";
-      sha256 = "1cr5dcj9628lkz1qlwq3fv97c25363qppkmcayqvd05dpy573259";
+      url = "https://files.pythonhosted.org/packages/0f/86/e19659527668d70be91d0369aeaa055b4eb396b0f387a4f92293a20035bd/pycparser-2.20.tar.gz";
+      sha256 = "1w0m3xvlrzq4lkbvd1ngfm8mdw64r1yxy6n7djlw6qj5d0km6ird";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1414,11 +1454,11 b' self: super: {'
     };
   };
   "pyparsing" = super.buildPythonPackage {
-    name = "pyparsing-2.4.5";
+    name = "pyparsing-2.4.7";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/00/32/8076fa13e832bb4dcff379f18f228e5a53412be0631808b9ca2610c0f566/pyparsing-2.4.5.tar.gz";
-      sha256 = "0fk8gsybiw1gm146mkjdjvaajwh20xwvpv4j7syh2zrnpq0j19jc";
+      url = "https://files.pythonhosted.org/packages/c1/47/dfc9c342c9842bbe0036c7f763d2d6686bcf5eb1808ba3e170afdb282210/pyparsing-2.4.7.tar.gz";
+      sha256 = "1hgc8qrbq1ymxbwfbjghv01fm3fbpjwpjwi0bcailxxzhf3yq0y2";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1448,7 +1488,7 b' self: super: {'
     };
   };
   "pyramid-debugtoolbar" = super.buildPythonPackage {
-    name = "pyramid-debugtoolbar-4.5.1";
+    name = "pyramid-debugtoolbar-4.6.1";
     doCheck = false;
     propagatedBuildInputs = [
       self."pyramid"
@@ -1458,8 +1498,8 b' self: super: {'
       self."ipaddress"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/88/21/74e7fa52edc74667e29403bd0cb4f2bb74dc4014711de313868001bf639f/pyramid_debugtoolbar-4.5.1.tar.gz";
-      sha256 = "0hgf6i1fzvq43m9vjdmb24nnv8fwp7sdzrx9bcwrgpy24n07am9a";
+      url = "https://files.pythonhosted.org/packages/99/f6/b8603f82c18275be293921bc3a2184205056ca505747bf64ab8a0c08e124/pyramid_debugtoolbar-4.6.1.tar.gz";
+      sha256 = "185z7q8n959ga5331iczwra2iljwkidfx4qn6bbd7vm3rm4w6llv";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } pkgs.lib.licenses.bsdOriginal ];
@@ -1646,15 +1686,15 b' self: super: {'
     };
   };
   "python-ldap" = super.buildPythonPackage {
-    name = "python-ldap-3.1.0";
+    name = "python-ldap-3.2.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."pyasn1"
       self."pyasn1-modules"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/7f/1c/28d721dff2fcd2fef9d55b40df63a00be26ec8a11e8c6fc612ae642f9cfd/python-ldap-3.1.0.tar.gz";
-      sha256 = "1i97nwfnraylyn0myxlf3vciicrf5h6fymrcff9c00k581wmx5s1";
+      url = "https://files.pythonhosted.org/packages/ea/93/596f875e003c770447f4b99267820a0c769dd2dc3ae3ed19afe460fcbad0/python-ldap-3.2.0.tar.gz";
+      sha256 = "13nvrhp85yr0jyxixcjj012iw8l9wynxxlykm9j3alss6waln73x";
     };
     meta = {
       license = [ pkgs.lib.licenses.psfl ];
@@ -1702,11 +1742,11 b' self: super: {'
     };
   };
   "pytz" = super.buildPythonPackage {
-    name = "pytz-2019.2";
+    name = "pytz-2019.3";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/27/c0/fbd352ca76050952a03db776d241959d5a2ee1abddfeb9e2a53fdb489be4/pytz-2019.2.tar.gz";
-      sha256 = "0ckb27hhjc8i8gcdvk4d9avld62b7k52yjijc60s2m3y8cpb7h16";
+      url = "https://files.pythonhosted.org/packages/82/c3/534ddba230bd4fbbd3b7a3d35f3341d014cca213f369a9940925e7e5f691/pytz-2019.3.tar.gz";
+      sha256 = "1ghrk1wg45d3nymj7bf4zj03n3bh64xmczhk4pfi577hdkdhcb5h";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1724,11 +1764,11 b' self: super: {'
     };
   };
   "redis" = super.buildPythonPackage {
-    name = "redis-3.3.11";
+    name = "redis-3.4.1";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/06/ca/00557c74279d2f256d3c42cabf237631355f3a132e4c74c2000e6647ad98/redis-3.3.11.tar.gz";
-      sha256 = "1hicqbi5xl92hhml82awrr2rxl9jar5fp8nbcycj9qgmsdwc43wd";
+      url = "https://files.pythonhosted.org/packages/ef/2e/2c0f59891db7db087a7eeaa79bc7c7f2c039e71a2b5b0a41391e9d462926/redis-3.4.1.tar.gz";
+      sha256 = "07yaj0j9fs7xdkg5bg926fa990khyigjbp31si8ai20vj8sv7kqd";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1779,7 +1819,7 b' self: super: {'
     };
   };
   "rhodecode-enterprise-ce" = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.18.3";
+    name = "rhodecode-enterprise-ce-4.19.0";
     buildInputs = [
       self."pytest"
       self."py"
@@ -1833,6 +1873,7 b' self: super: {'
       self."pastedeploy"
       self."pastescript"
       self."peppercorn"
+      self."premailer"
       self."psutil"
       self."py-bcrypt"
       self."pycurl"
@@ -1976,11 +2017,11 b' self: super: {'
     };
   };
   "setuptools" = super.buildPythonPackage {
-    name = "setuptools-44.0.0";
+    name = "setuptools-44.1.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485/setuptools-44.0.0.zip";
-      sha256 = "025h5cnxcmda1893l6i12hrwdvs1n8r31qs6q4pkif2v7rrggfp5";
+      url = "https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip";
+      sha256 = "1jja896zvd1ppccnjbhkgagxbwchgq6vfamp6qn1hvywq6q9cjkr";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -2020,11 +2061,11 b' self: super: {'
     };
   };
   "sqlalchemy" = super.buildPythonPackage {
-    name = "sqlalchemy-1.3.11";
+    name = "sqlalchemy-1.3.15";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/34/5c/0e1d7ad0ca52544bb12f9cb8d5cc454af45821c92160ffedd38db0a317f6/SQLAlchemy-1.3.11.tar.gz";
-      sha256 = "12izpqqgy738ndn7qqn962qxi8qw2xb9vg2i880x12paklg599dg";
+      url = "https://files.pythonhosted.org/packages/8c/30/4134e726dd5ed13728ff814fa91fc01c447ad8700504653fe99d91fdd34b/SQLAlchemy-1.3.15.tar.gz";
+      sha256 = "0iglkvymfp35zm5pxy5kzqvcv96kkas0chqdx7xpla86sspa9k64";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -2212,11 +2253,11 b' self: super: {'
     };
   };
   "wcwidth" = super.buildPythonPackage {
-    name = "wcwidth-0.1.7";
+    name = "wcwidth-0.1.9";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/55/11/e4a2bb08bb450fdbd42cc709dd40de4ed2c472cf0ccb9e64af22279c5495/wcwidth-0.1.7.tar.gz";
-      sha256 = "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx";
+      url = "https://files.pythonhosted.org/packages/25/9d/0acbed6e4a4be4fc99148f275488580968f44ddb5e69b8ceb53fc9df55a0/wcwidth-0.1.9.tar.gz";
+      sha256 = "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -2234,7 +2275,7 b' self: super: {'
     };
   };
   "weberror" = super.buildPythonPackage {
-    name = "weberror-0.10.3";
+    name = "weberror-0.13.1";
     doCheck = false;
     propagatedBuildInputs = [
       self."webob"
@@ -2243,8 +2284,8 b' self: super: {'
       self."paste"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/35/76/e7e5c2ce7e9c7f31b54c1ff295a495886d1279a002557d74dd8957346a79/WebError-0.10.3.tar.gz";
-      sha256 = "0frg4kvycqpj5bi8asfqfs6bxsr2cvjvb6b56c4d1ai1z57kbjx6";
+      url = "https://files.pythonhosted.org/packages/07/0a/09ca5eb0fab5c0d17b380026babe81c96ecebb13f2b06c3203432dd7be72/WebError-0.13.1.tar.gz";
+      sha256 = "0r4qvnf2r92gfnpa1kwygh4j2x6j3axg2i4an6hyxwg2gpaqp7y1";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -2277,7 +2318,7 b' self: super: {'
     };
   };
   "webtest" = super.buildPythonPackage {
-    name = "webtest-2.0.33";
+    name = "webtest-2.0.34";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
@@ -2286,8 +2327,8 b' self: super: {'
       self."beautifulsoup4"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/a8/b0/ffc9413b637dbe26e291429bb0f6ed731e518d0cd03da28524a8fe2e8a8f/WebTest-2.0.33.tar.gz";
-      sha256 = "1l3z0cwqslsf4rcrhi2gr8kdfh74wn2dw76376i4g9i38gz8wd21";
+      url = "https://files.pythonhosted.org/packages/2c/74/a0e63feee438735d628631e2b70d82280276a930637ac535479e5fad9427/WebTest-2.0.34.tar.gz";
+      sha256 = "0x1y2c8z4fmpsny4hbp6ka37si2g10r5r2jwxhvv5mx7g3blq4bi";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -2327,14 +2368,14 b' self: super: {'
     };
   };
   "zipp" = super.buildPythonPackage {
-    name = "zipp-0.6.0";
+    name = "zipp-1.2.0";
     doCheck = false;
     propagatedBuildInputs = [
-      self."more-itertools"
+      self."contextlib2"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/57/dd/585d728479d97d25aeeb9aa470d36a4ad8d0ba5610f84e14770128ce6ff7/zipp-0.6.0.tar.gz";
-      sha256 = "13ndkf7vklw978a4gdl1yfvn8hch28429a0iam67sg4nrp5v261p";
+      url = "https://files.pythonhosted.org/packages/78/08/d52f0ea643bc1068d6dc98b412f4966a9b63255d20911a23ac3220c033c4/zipp-1.2.0.tar.gz";
+      sha256 = "1c91lnv1bxjimh8as27hz7bghsjkkbxn1d37xq7in9c82iai0167";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];

requirements.txt

@@ -3,7 +3,7 b''
 amqp==2.5.2
 babel==1.3
 beaker==1.9.1
-bleach==3.1.0
+bleach==3.1.3
 celery==4.3.0
 channelstream==0.5.2
 click==7.0
@@ -14,7 +14,7 b' cssselect==1.0.3'
 cryptography==2.6.1
 decorator==4.1.2
 deform==2.0.8
-docutils==0.14.0
+docutils==0.16.0
 dogpile.cache==0.9.0
 dogpile.core==0.4.1
 formencode==1.2.4
@@ -30,38 +30,39 b' markdown==2.6.11'
 markupsafe==1.1.1
 msgpack-python==0.5.6
 pyotp==2.3.0
-packaging==19.2
+packaging==20.3
 pathlib2==2.3.5
-paste==3.2.1
-pastedeploy==2.0.1
+paste==3.4.0
+pastedeploy==2.1.0
 pastescript==3.2.0
 peppercorn==0.6
-psutil==5.6.5
+premailer==3.6.1
+psutil==5.7.0
 py-bcrypt==0.4
 pycurl==7.43.0.3
 pycrypto==2.6.1
 pygments==2.4.2
-pyparsing==2.4.5
-pyramid-debugtoolbar==4.5.1
+pyparsing==2.4.7
+pyramid-debugtoolbar==4.6.1
 pyramid-mako==1.1.0
 pyramid==1.10.4
 pyramid_mailer==0.15.1
 python-dateutil==2.8.1
-python-ldap==3.1.0
+python-ldap==3.2.0
 python-memcached==1.59
 python-pam==1.8.4
 python-saml==2.4.2
-pytz==2019.2
+pytz==2019.3
 tzlocal==1.5.1
 pyzmq==14.6.0
 py-gfm==0.1.4
-redis==3.3.11
+redis==3.4.1
 repoze.lru==0.7
 requests==2.22.0
 routes==2.4.1
 simplejson==3.16.0
 six==1.11.0
-sqlalchemy==1.3.11
+sqlalchemy==1.3.15
 sshpubkeys==3.1.0
 subprocess32==3.5.4
 supervisor==4.1.0
@@ -69,7 +70,7 b' translationstring==1.3'
 urllib3==1.25.2
 urlobject==2.4.3
 venusian==1.2.0
-weberror==0.10.3
+weberror==0.13.1
 webhelpers2==2.0
 webob==1.8.5
 whoosh==2.7.4
@@ -94,18 +95,18 b' jupyter-client==5.0.0'
 jupyter-core==4.5.0
 
 ## cli tools
-alembic==1.3.1
+alembic==1.4.2
 invoke==0.13.0
 bumpversion==0.5.3
 
 ## http servers
-gevent==1.4.0
+gevent==1.5.0
 greenlet==0.4.15
 gunicorn==19.9.0
 waitress==1.3.1
 
 ## debug
-ipdb==0.12.0
+ipdb==0.13.2
 ipython==5.1.0
 
 ## rhodecode-tools, special case, use file://PATH.tar.gz#egg=rhodecode-tools==X.Y.Z, to test local version

requirements_pinned.txt

@@ -10,9 +10,9 b' configparser==4.0.2'
 contextlib2==0.6.0.post1
 ecdsa==0.13.2
 gnureadline==6.3.8
-hupper==1.9.1
+hupper==1.10.2
 ipaddress==1.0.23
-importlib-metadata==0.23
+importlib-metadata==1.6.0
 jinja2==2.9.6
 jsonschema==2.6.0
 pluggy==0.13.1
@@ -24,4 +24,4 b' tempita==0.5.2'
 testpath==0.4.4
 transaction==2.4.0
 vine==1.3.0
-wcwidth==0.1.7
+wcwidth==0.1.9

requirements_test.txt

@@ -12,5 +12,5 b' mock==3.0.5'
 cov-core==1.15.0
 coverage==4.5.4
 
-webtest==2.0.33
+webtest==2.0.34
 beautifulsoup4==4.6.3

rhodecode/VERSION

@@ -1,1 +1,1 b''
-4.18.3
  No newline at end of file
+4.19.0
  No newline at end of file

rhodecode/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -19,17 +19,20 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import os
+from collections import OrderedDict
+
 import sys
 import platform
 
 VERSION = tuple(open(os.path.join(
     os.path.dirname(__file__), 'VERSION')).read().split('.'))
 
-BACKENDS = {
-    'hg': 'Mercurial repository',
-    'git': 'Git repository',
-    'svn': 'Subversion repository',
-}
+BACKENDS = OrderedDict()
+
+BACKENDS['hg'] = 'Mercurial repository'
+BACKENDS['git'] = 'Git repository'
+BACKENDS['svn'] = 'Subversion repository'
+
 
 CELERY_ENABLED = False
 CELERY_EAGER = False
@@ -45,7 +48,7 b' PYRAMID_SETTINGS = {}'
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 103  # defines current db version for migrations
+__dbversion__ = 107  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'

rhodecode/api/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/exc.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/conftest.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_add_field_to_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_add_user_to_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_cleanup_sessions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2019 RhodeCode GmbH
+# Copyright (C) 2017-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_close_pull_request.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_comment_commit.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_comment_pull_request.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_create_gist.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_create_pull_request.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_create_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_create_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_create_user.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_create_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_delete_gist.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_delete_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_delete_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_delete_user.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_delete_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_deprecated_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_fork_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_fts_search.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_gist.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_gists.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_ip.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_locks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_method.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_pull_request.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_pull_request_comments.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -60,7 +60,10 b' class TestGetPullRequestComments(object)'
              'comment_text': 'Auto status change to |new_status|\n\n.. |new_status| replace:: *"Under Review"*',
              'comment_type': 'note',
              'comment_resolved_by': None,
-             'pull_request_version': None}
+             'pull_request_version': None,
+             'comment_commit_id': None,
+             'comment_pull_request_id': pull_request.pull_request_id
+             }
         ]
         assert_ok(id_, expected, response.body)
 

rhodecode/api/tests/test_get_pull_requests.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repo_changeset.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repo_comments.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repo_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repo_nodes.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repo_refs.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_repos.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_server_info.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_user.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_user_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_get_users.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_grant_user_group_permission.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_grant_user_group_permission_to_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_grant_user_group_permission_to_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_grant_user_permission.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_grant_user_permission_to_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_grant_user_permission_to_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_invalidate_cache.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_merge_pull_request.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_pull.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_remove_field_from_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_remove_user_from_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_repo_locking.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_rescan_repos.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_revoke_user_group_permission.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_revoke_user_group_permission_from_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_revoke_user_group_permission_from_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_revoke_user_permission.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_revoke_user_permission_from_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_revoke_user_permission_from_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_store_exception.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_update_pull_request.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_update_repo.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_update_repo_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_update_user.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_update_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/test_utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/tests/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -49,7 +49,8 b' def assert_call_ok(id_, given):'
 def assert_ok(id_, expected, given):
     given = json.loads(given)
     if given.get('error'):
-        pytest.fail("Unexpected ERROR in success response: {}".format(given['error']))
+        err = given['error']
+        pytest.fail(u"Unexpected ERROR in success response: {}".format(err))
 
     expected = jsonify({
         'id': id_,

rhodecode/api/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2014-2019 RhodeCode GmbH
+# Copyright (C) 2014-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2015-2019 RhodeCode GmbH
+# Copyright (C) 2015-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/deprecated_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/gist_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/pull_request_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -379,7 +379,9 b' def get_pull_request_comments('
               },
               "comment_text": "Example text",
               "comment_type": null,
-              "pull_request_version": null
+              "pull_request_version": null,
+              "comment_commit_id": None,
+              "comment_pull_request_id": <pull_request_id>
             }
         ],
         error :  null
@@ -684,28 +686,9 b' def create_pull_request('
     full_source_ref = resolve_ref_or_error(source_ref, source_db_repo)
     full_target_ref = resolve_ref_or_error(target_ref, target_db_repo)
 
-    source_scm = source_db_repo.scm_instance()
-    target_scm = target_db_repo.scm_instance()
-
     source_commit = get_commit_or_error(full_source_ref, source_db_repo)
     target_commit = get_commit_or_error(full_target_ref, target_db_repo)
 
-    ancestor = source_scm.get_common_ancestor(
-        source_commit.raw_id, target_commit.raw_id, target_scm)
-    if not ancestor:
-        raise JSONRPCError('no common ancestor found')
-
-    # recalculate target ref based on ancestor
-    target_ref_type, target_ref_name, __ = full_target_ref.split(':')
-    full_target_ref = ':'.join((target_ref_type, target_ref_name, ancestor))
-
-    commit_ranges = target_scm.compare(
-        target_commit.raw_id, source_commit.raw_id, source_scm,
-        merge=True, pre_load=[])
-
-    if not commit_ranges:
-        raise JSONRPCError('no commits found')
-
     reviewer_objects = Optional.extract(reviewers) or []
 
     # serialize and validate passed in given reviewers
@@ -725,16 +708,16 b' def create_pull_request('
         PullRequestModel().get_reviewer_functions()
 
     # recalculate reviewers logic, to make sure we can validate this
-    reviewer_rules = get_default_reviewers_data(
+    default_reviewers_data = get_default_reviewers_data(
         owner, source_db_repo,
         source_commit, target_db_repo, target_commit)
 
     # now MERGE our given with the calculated
-    reviewer_objects = reviewer_rules['reviewers'] + reviewer_objects
+    reviewer_objects = default_reviewers_data['reviewers'] + reviewer_objects
 
     try:
         reviewers = validate_default_reviewers(
-            reviewer_objects, reviewer_rules)
+            reviewer_objects, default_reviewers_data)
     except ValueError as e:
         raise JSONRPCError('Reviewers Validation: {}'.format(e))
 
@@ -746,6 +729,24 b' def create_pull_request('
             source_ref=title_source_ref,
             target=target_repo
         )
+
+    diff_info = default_reviewers_data['diff_info']
+    common_ancestor_id = diff_info['ancestor']
+    commits = diff_info['commits']
+
+    if not common_ancestor_id:
+        raise JSONRPCError('no common ancestor found')
+
+    if not commits:
+        raise JSONRPCError('no commits found')
+
+    # NOTE(marcink): reversed is consistent with how we open it in the WEB interface
+    revisions = [commit.raw_id for commit in reversed(commits)]
+
+    # recalculate target ref based on ancestor
+    target_ref_type, target_ref_name, __ = full_target_ref.split(':')
+    full_target_ref = ':'.join((target_ref_type, target_ref_name, common_ancestor_id))
+
     # fetch renderer, if set fallback to plain in case of PR
     rc_config = SettingsModel().get_all_settings()
     default_system_renderer = rc_config.get('rhodecode_markup_renderer', 'plain')
@@ -758,12 +759,13 b' def create_pull_request('
         source_ref=full_source_ref,
         target_repo=target_repo,
         target_ref=full_target_ref,
-        revisions=[commit.raw_id for commit in reversed(commit_ranges)],
+        common_ancestor_id=common_ancestor_id,
+        revisions=revisions,
         reviewers=reviewers,
         title=title,
         description=description,
         description_renderer=description_renderer,
-        reviewer_data=reviewer_rules,
+        reviewer_data=default_reviewers_data,
         auth_user=apiuser
     )
 

rhodecode/api/views/repo_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -33,7 +33,7 b' from rhodecode.lib import audit_logger, '
 from rhodecode.lib import repo_maintenance
 from rhodecode.lib.auth import HasPermissionAnyApi, HasUserGroupPermissionAnyApi
 from rhodecode.lib.celerylib.utils import get_task_id
-from rhodecode.lib.utils2 import str2bool, time_to_datetime, safe_str, safe_int
+from rhodecode.lib.utils2 import str2bool, time_to_datetime, safe_str, safe_int, safe_unicode
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.exceptions import StatusChangeOnClosedPullRequestError
 from rhodecode.lib.vcs import RepositoryError
@@ -573,6 +573,7 b' def get_repo_file(request, apiuser, repo'
     elif details == 'full':
         extended_info = content = True
 
+    file_path = safe_unicode(file_path)
     try:
         # check if repo is not empty by any chance, skip quicker if it is.
         _scm = repo.scm_instance()
@@ -583,12 +584,12 b' def get_repo_file(request, apiuser, repo'
             repo, commit_id, file_path, extended_info=extended_info,
             content=content, max_file_bytes=max_file_bytes, cache=cache)
     except NodeDoesNotExistError:
-        raise JSONRPCError('There is no file in repo: `{}` at path `{}` for commit: `{}`'.format(
+        raise JSONRPCError(u'There is no file in repo: `{}` at path `{}` for commit: `{}`'.format(
             repo.repo_name, file_path, commit_id))
     except Exception:
-        log.exception("Exception occurred while trying to get repo %s file",
+        log.exception(u"Exception occurred while trying to get repo %s file",
                       repo.repo_name)
-        raise JSONRPCError('failed to get repo: `{}` file at path {}'.format(
+        raise JSONRPCError(u'failed to get repo: `{}` file at path {}'.format(
             repo.repo_name, file_path))
 
     return node
@@ -1599,7 +1600,8 b' def comment_commit('
         validate_repo_permissions(apiuser, repoid, repo, _perms)
 
     try:
-        commit_id = repo.scm_instance().get_commit(commit_id=commit_id).raw_id
+        commit = repo.scm_instance().get_commit(commit_id=commit_id)
+        commit_id = commit.raw_id
     except Exception as e:
         log.exception('Failed to fetch commit')
         raise JSONRPCError(safe_str(e))
@@ -1655,10 +1657,14 b' def comment_commit('
             except StatusChangeOnClosedPullRequestError:
                 log.exception(
                     "Exception occurred while trying to change repo commit status")
-                msg = ('Changing status on a changeset associated with '
+                msg = ('Changing status on a commit associated with '
                        'a closed pull request is not allowed')
                 raise JSONRPCError(msg)
 
+        CommentsModel().trigger_commit_comment_hook(
+            repo, apiuser, 'create',
+            data={'comment': comment, 'commit': commit})
+
         Session().commit()
         return {
             'msg': (

rhodecode/api/views/repo_group_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/search_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -22,10 +22,12 b''
 import logging
 
 from rhodecode.api import jsonrpc_method
-from rhodecode.api.exc import JSONRPCValidationError
-from rhodecode.api.utils import Optional
+from rhodecode.api.exc import JSONRPCValidationError, JSONRPCForbidden
+from rhodecode.api.utils import Optional, has_superadmin_permission
 from rhodecode.lib.index import searcher_from_config
+from rhodecode.lib.user_log_filter import user_log_filter
 from rhodecode.model import validation_schema
+from rhodecode.model.db import joinedload, UserLog
 from rhodecode.model.validation_schema.schemas import search_schema
 
 log = logging.getLogger(__name__)
@@ -116,3 +118,35 b' def search(request, apiuser, search_quer'
                 colander_exc=validation_schema.Invalid(node, search_result['error']))
 
     return data
+
+
+@jsonrpc_method()
+def get_audit_logs(request, apiuser, query):
+    """
+    return full audit logs based on the query.
+
+    Please see `example query in admin > settings > audit logs` for examples
+
+    :param apiuser: This is filled automatically from the |authtoken|.
+    :type apiuser: AuthUser
+    :param query: filter query, example: action:repo.artifact.add date:[20200401 TO 20200601]"
+    :type query: str
+    """
+
+    if not has_superadmin_permission(apiuser):
+        raise JSONRPCForbidden()
+
+    filter_term = query
+    ret = []
+
+    # show all user actions
+    user_log = UserLog.query() \
+        .options(joinedload(UserLog.user)) \
+        .options(joinedload(UserLog.repository)) \
+        .order_by(UserLog.action_date.desc())
+
+    audit_log = user_log_filter(user_log, filter_term)
+
+    for entry in audit_log:
+        ret.append(entry)
+    return ret

rhodecode/api/views/server_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/testing_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/user_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/api/views/user_group_api.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/_base/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -396,7 +396,11 b' class PathFilter(object):'
     def path_access_allowed(self, path):
         log.debug('Checking ACL permissions for PathFilter for `%s`', path)
         if self.permission_checker:
-            return path and self.permission_checker.has_access(path)
+            has_access = path and self.permission_checker.has_access(path)
+            log.debug('ACL Permissions checker enabled, ACL Check has_access: %s', has_access)
+            return has_access
+
+        log.debug('ACL permissions checker not enabled, skipping...')
         return True
 
     def filter_patchset(self, patchset):

rhodecode/apps/_base/interfaces.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/_base/navigation.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/_base/subscribers.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -25,6 +25,15 b' from rhodecode.lib import rc_cache'
 
 log = logging.getLogger(__name__)
 
+# names of namespaces used for different permission related cached
+# during flush operation we need to take care of all those
+cache_namespaces = [
+    'cache_user_auth.{}',
+    'cache_user_repo_acl_ids.{}',
+    'cache_user_user_group_acl_ids.{}',
+    'cache_user_repo_group_acl_ids.{}'
+]
+
 
 def trigger_user_permission_flush(event):
     """
@@ -35,9 +44,11 b' def trigger_user_permission_flush(event)'
 
     affected_user_ids = set(event.user_ids)
     for user_id in affected_user_ids:
-        cache_namespace_uid = 'cache_user_auth.{}'.format(user_id)
-        del_keys = rc_cache.clear_cache_namespace('cache_perms', cache_namespace_uid)
-        log.debug('Deleted %s cache keys for user_id: %s', del_keys, user_id)
+        for cache_namespace_uid_tmpl in cache_namespaces:
+            cache_namespace_uid = cache_namespace_uid_tmpl.format(user_id)
+            del_keys = rc_cache.clear_cache_namespace('cache_perms', cache_namespace_uid)
+            log.debug('Deleted %s cache keys for user_id: %s and namespace %s',
+                      del_keys, user_id, cache_namespace_uid)
 
 
 def includeme(config):

rhodecode/apps/admin/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -26,7 +26,6 b' def admin_routes(config):'
     """
     Admin prefixed routes
     """
-
     config.add_route(
         name='admin_audit_logs',
         pattern='/audit_logs')
@@ -291,12 +290,22 b' def admin_routes(config):'
         pattern='/users/{user_id:\d+}/create_repo_group',
         user_route=True)
 
+    # user notice
+    config.add_route(
+        name='user_notice_dismiss',
+        pattern='/users/{user_id:\d+}/notice_dismiss',
+        user_route=True)
+
     # user auth tokens
     config.add_route(
         name='edit_user_auth_tokens',
         pattern='/users/{user_id:\d+}/edit/auth_tokens',
         user_route=True)
     config.add_route(
+        name='edit_user_auth_tokens_view',
+        pattern='/users/{user_id:\d+}/edit/auth_tokens/view',
+        user_route=True)
+    config.add_route(
         name='edit_user_auth_tokens_add',
         pattern='/users/{user_id:\d+}/edit/auth_tokens/new',
         user_route=True)

rhodecode/apps/admin/tests/test_admin_audit_logs.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/tests/test_admin_auth_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/tests/test_admin_defaults.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/tests/test_admin_main_views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/tests/test_admin_permissions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -228,7 +228,7 b' class TestAdminPermissionsController(Tes'
         self.log_user()
 
         # ADD
-        default_user_id = User.get_default_user().user_id
+        default_user_id = User.get_default_user_id()
         self.app.post(
             route_path('edit_user_ips_add', user_id=default_user_id),
             params={'new_ip': '0.0.0.0/24', 'csrf_token': self.csrf_token})
@@ -238,7 +238,7 b' class TestAdminPermissionsController(Tes'
         response.mustcontain('0.0.0.0 - 0.0.0.255')
 
         # DELETE
-        default_user_id = User.get_default_user().user_id
+        default_user_id = User.get_default_user_id()
         del_ip_id = UserIpMap.query().filter(UserIpMap.user_id ==
                                              default_user_id).first().ip_id
 

rhodecode/apps/admin/tests/test_admin_repos.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -84,15 +84,13 b' class TestAdminRepos(object):'
         with mock.patch('rhodecode.BACKENDS', {'git': 'git'}):
             response = self.app.get(route_path('repo_new'), status=200)
         assert_response = response.assert_response()
-        element = assert_response.get_element('#repo_type')
-        assert element.text_content() == '\ngit\n'
+        element = assert_response.get_element('[name=repo_type]')
+        assert element.get('value') == 'git'
 
     def test_create_page_non_restricted_backends(self, autologin_user, backend):
         response = self.app.get(route_path('repo_new'), status=200)
         assert_response = response.assert_response()
-        assert_response.element_contains('#repo_type', 'git')
-        assert_response.element_contains('#repo_type', 'svn')
-        assert_response.element_contains('#repo_type', 'hg')
+        assert ['hg', 'git', 'svn'] == [x.get('value') for x in assert_response.get_elements('[name=repo_type]')]
 
     @pytest.mark.parametrize(
         "suffix", [u'', u'xxa'], ids=['', 'non-ascii'])

rhodecode/apps/admin/tests/test_admin_repository_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/tests/test_admin_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/tests/test_admin_user_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/tests/test_admin_users.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -143,7 +143,7 b' class TestAdminUsersView(TestController)'
         response = self.app.get(
             route_path('edit_user_auth_tokens', user_id=user_id))
         for token in auth_tokens:
-            response.mustcontain(token)
+            response.mustcontain(token[:4])
             response.mustcontain('never')
 
     @pytest.mark.parametrize("desc, lifetime", [
@@ -165,7 +165,7 b' class TestAdminUsersView(TestController)'
         response = response.follow()
         user = User.get(user_id)
         for auth_token in user.auth_tokens:
-            response.mustcontain(auth_token)
+            response.mustcontain(auth_token[:4])
 
     def test_delete_auth_token(self, user_util):
         self.log_user()

rhodecode/apps/admin/tests/test_admin_users_ssh_keys.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/audit_logs.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/defaults.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/exception_tracker.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2018-2019 RhodeCode GmbH
+# Copyright (C) 2018-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/main_views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/open_source_licenses.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/permissions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -142,7 +142,7 b' class AdminPermissionsView(BaseAppView, '
             h.flash(_('Error occurred during update of permissions'),
                     category='error')
 
-        affected_user_ids = [User.get_default_user().user_id]
+        affected_user_ids = [User.get_default_user_id()]
         PermissionModel().trigger_permission_flush(affected_user_ids)
 
         raise HTTPFound(h.route_path('admin_permissions_application'))
@@ -218,7 +218,7 b' class AdminPermissionsView(BaseAppView, '
             h.flash(_('Error occurred during update of permissions'),
                     category='error')
 
-        affected_user_ids = [User.get_default_user().user_id]
+        affected_user_ids = [User.get_default_user_id()]
         PermissionModel().trigger_permission_flush(affected_user_ids)
 
         raise HTTPFound(h.route_path('admin_permissions_object'))
@@ -320,7 +320,7 b' class AdminPermissionsView(BaseAppView, '
             h.flash(_('Error occurred during update of permissions'),
                     category='error')
 
-        affected_user_ids = [User.get_default_user().user_id]
+        affected_user_ids = [User.get_default_user_id()]
         PermissionModel().trigger_permission_flush(affected_user_ids)
 
         raise HTTPFound(h.route_path('admin_permissions_global'))

rhodecode/apps/admin/views/process_management.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/repo_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/repositories.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/sessions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/svn_config.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -41,9 +41,9 b' class SvnConfigAdminSettingsView(BaseApp'
     def vcs_svn_generate_config(self):
         _ = self.request.translate
         try:
-            generate_mod_dav_svn_config(self.request.registry)
+            file_path = generate_mod_dav_svn_config(self.request.registry)
             msg = {
-                'message': _('Apache configuration for Subversion generated.'),
+                'message': _('Apache configuration for Subversion generated at `{}`.').format(file_path),
                 'level': 'success',
             }
         except Exception:

rhodecode/apps/admin/views/system_info.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/user_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/admin/views/users.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -34,12 +34,13 b' from rhodecode.apps.ssh_support import S'
 from rhodecode.authentication.base import get_authn_registry, RhodeCodeExternalAuthPlugin
 from rhodecode.authentication.plugins import auth_rhodecode
 from rhodecode.events import trigger
-from rhodecode.model.db import true
+from rhodecode.model.db import true, UserNotice
 
 from rhodecode.lib import audit_logger, rc_cache
 from rhodecode.lib.exceptions import (
     UserCreationError, UserOwnsReposException, UserOwnsRepoGroupsException,
-    UserOwnsUserGroupsException, DefaultUserException)
+    UserOwnsUserGroupsException, UserOwnsPullRequestsException,
+    UserOwnsArtifactsException, DefaultUserException)
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator, CSRFRequired)
@@ -377,11 +378,13 b' class UsersView(UserAppView):'
         _repos = c.user.repositories
         _repo_groups = c.user.repository_groups
         _user_groups = c.user.user_groups
+        _pull_requests = c.user.user_pull_requests
         _artifacts = c.user.artifacts
 
         handle_repos = None
         handle_repo_groups = None
         handle_user_groups = None
+        handle_pull_requests = None
         handle_artifacts = None
 
         # calls for flash of handle based on handle case detach or delete
@@ -412,6 +415,15 b' class UsersView(UserAppView):'
                 h.flash(_('Deleted %s user groups') % len(_user_groups),
                         category='success')
 
+        def set_handle_flash_pull_requests():
+            handle = handle_pull_requests
+            if handle == 'detach':
+                h.flash(_('Detached %s pull requests') % len(_pull_requests),
+                        category='success')
+            elif handle == 'delete':
+                h.flash(_('Deleted %s pull requests') % len(_pull_requests),
+                        category='success')
+
         def set_handle_flash_artifacts():
             handle = handle_artifacts
             if handle == 'detach':
@@ -421,6 +433,12 b' class UsersView(UserAppView):'
                 h.flash(_('Deleted %s artifacts') % len(_artifacts),
                         category='success')
 
+        handle_user = User.get_first_super_admin()
+        handle_user_id = safe_int(self.request.POST.get('detach_user_id'))
+        if handle_user_id:
+            # NOTE(marcink): we get new owner for objects...
+            handle_user = User.get_or_404(handle_user_id)
+
         if _repos and self.request.POST.get('user_repos'):
             handle_repos = self.request.POST['user_repos']
 
@@ -430,16 +448,25 b' class UsersView(UserAppView):'
         if _user_groups and self.request.POST.get('user_user_groups'):
             handle_user_groups = self.request.POST['user_user_groups']
 
+        if _pull_requests and self.request.POST.get('user_pull_requests'):
+            handle_pull_requests = self.request.POST['user_pull_requests']
+
         if _artifacts and self.request.POST.get('user_artifacts'):
             handle_artifacts = self.request.POST['user_artifacts']
 
         old_values = c.user.get_api_data()
 
         try:
-            UserModel().delete(c.user, handle_repos=handle_repos,
-                               handle_repo_groups=handle_repo_groups,
-                               handle_user_groups=handle_user_groups,
-                               handle_artifacts=handle_artifacts)
+
+            UserModel().delete(
+                c.user,
+                handle_repos=handle_repos,
+                handle_repo_groups=handle_repo_groups,
+                handle_user_groups=handle_user_groups,
+                handle_pull_requests=handle_pull_requests,
+                handle_artifacts=handle_artifacts,
+                handle_new_owner=handle_user
+            )
 
             audit_logger.store_web(
                 'user.delete', action_data={'old_data': old_values},
@@ -449,11 +476,13 b' class UsersView(UserAppView):'
             set_handle_flash_repos()
             set_handle_flash_repo_groups()
             set_handle_flash_user_groups()
+            set_handle_flash_pull_requests()
             set_handle_flash_artifacts()
             username = h.escape(old_values['username'])
             h.flash(_('Successfully deleted user `{}`').format(username), category='success')
         except (UserOwnsReposException, UserOwnsRepoGroupsException,
-                UserOwnsUserGroupsException, DefaultUserException) as e:
+                UserOwnsUserGroupsException, UserOwnsPullRequestsException,
+                UserOwnsArtifactsException, DefaultUserException) as e:
             h.flash(e, category='warning')
         except Exception:
             log.exception("Exception during deletion of user")
@@ -502,6 +531,11 b' class UsersView(UserAppView):'
         user_id = self.db_user_id
         c.user = self.db_user
 
+        c.detach_user = User.get_first_super_admin()
+        detach_user_id = safe_int(self.request.GET.get('detach_user_id'))
+        if detach_user_id:
+            c.detach_user = User.get_or_404(detach_user_id)
+
         c.active = 'advanced'
         c.personal_repo_group = RepoGroup.get_user_personal_repo_group(user_id)
         c.personal_repo_group_name = RepoGroupModel()\
@@ -511,7 +545,6 b' class UsersView(UserAppView):'
             (x.user for x in c.user.user_review_rules),
             key=lambda u: u.username.lower())
 
-        c.first_admin = User.get_first_super_admin()
         defaults = c.user.get_dict()
 
         # Interim workaround if the user participated on any pull requests as a
@@ -705,6 +738,32 b' class UsersView(UserAppView):'
     @HasPermissionAllDecorator('hg.admin')
     @CSRFRequired()
     @view_config(
+        route_name='user_notice_dismiss', request_method='POST',
+        renderer='json_ext', xhr=True)
+    def user_notice_dismiss(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+
+        user_id = self.db_user_id
+        c.user = self.db_user
+        user_notice_id = safe_int(self.request.POST.get('notice_id'))
+        notice = UserNotice().query()\
+            .filter(UserNotice.user_id == user_id)\
+            .filter(UserNotice.user_notice_id == user_notice_id)\
+            .scalar()
+        read = False
+        if notice:
+            notice.notice_read = True
+            Session().add(notice)
+            Session().commit()
+            read = True
+
+        return {'notice': user_notice_id, 'read': read}
+
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @CSRFRequired()
+    @view_config(
         route_name='user_create_personal_repo_group', request_method='POST',
         renderer='rhodecode:templates/admin/users/user_edit.mako')
     def user_create_personal_repo_group(self):
@@ -778,6 +837,25 b' class UsersView(UserAppView):'
         c.role_vcs = AuthTokenModel.cls.ROLE_VCS
         return self._get_template_context(c)
 
+    @LoginRequired()
+    @HasPermissionAllDecorator('hg.admin')
+    @view_config(
+        route_name='edit_user_auth_tokens_view', request_method='POST',
+        renderer='json_ext', xhr=True)
+    def auth_tokens_view(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        c.user = self.db_user
+
+        auth_token_id = self.request.POST.get('auth_token_id')
+
+        if auth_token_id:
+            token = UserApiKeys.get_or_404(auth_token_id)
+
+            return {
+                'auth_token': token.api_key
+            }
+
     def maybe_attach_token_scope(self, token):
         # implemented in EE edition
         pass

rhodecode/apps/channelstream/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/channelstream/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/debug_style/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/debug_style/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -88,6 +88,15 b' Check if we should use full-topic or min'
             'modified': ['b/modified_file.rst'],
             'removed': ['.idea'],
         })
+
+        exc_traceback = {
+            'exc_utc_date': '2020-03-26T12:54:50.683281',
+            'exc_id': 139638856342656,
+            'exc_timestamp': '1585227290.683288',
+            'version': 'v1',
+            'exc_message': 'Traceback (most recent call last):\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/tweens.py", line 41, in excview_tween\n    response = handler(request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/router.py", line 148, in handle_request\n    registry, request, context, context_iface, view_name\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/view.py", line 667, in _call_view\n    response = view_callable(context, request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/config/views.py", line 188, in attr_view\n    return view(context, request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/config/views.py", line 214, in predicate_wrapper\n    return view(context, request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/viewderivers.py", line 401, in viewresult_to_response\n    result = view(context, request)\n  File "/nix/store/s43k2r9rysfbzmsjdqnxgzvvb7zjhkxb-python2.7-pyramid-1.10.4/lib/python2.7/site-packages/pyramid/viewderivers.py", line 132, in _class_view\n    response = getattr(inst, attr)()\n  File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/apps/debug_style/views.py", line 355, in render_email\n    template_type, **email_kwargs.get(email_id, {}))\n  File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/model/notification.py", line 402, in render_email\n    body = email_template.render(None, **_kwargs)\n  File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/lib/partial_renderer.py", line 95, in render\n    return self._render_with_exc(tmpl, args, kwargs)\n  File "/mnt/hgfs/marcink/workspace/rhodecode-enterprise-ce/rhodecode/lib/partial_renderer.py", line 79, in _render_with_exc\n    return render_func.render(*args, **kwargs)\n  File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/template.py", line 476, in render\n    return runtime._render(self, self.callable_, args, data)\n  File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/runtime.py", line 883, in _render\n    **_kwargs_for_callable(callable_, data)\n  File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/runtime.py", line 920, in _render_context\n    _exec_template(inherit, lclcontext, args=args, kwargs=kwargs)\n  File "/nix/store/dakh34sxz4yfr435c0cwjz0sd6hnd5g3-python2.7-mako-1.1.0/lib/python2.7/site-packages/mako/runtime.py", line 947, in _exec_template\n    callable_(context, *args, **kwargs)\n  File "rhodecode_templates_email_templates_base_mako", line 63, in render_body\n  File "rhodecode_templates_email_templates_exception_tracker_mako", line 43, in render_body\nAttributeError: \'str\' object has no attribute \'get\'\n',
+            'exc_type': 'AttributeError'
+        }
         email_kwargs = {
             'test': {},
             'message': {
@@ -97,6 +106,13 b' Check if we should use full-topic or min'
                 'user': user,
                 'date': datetime.datetime.now(),
             },
+            'exception': {
+                'email_prefix': '[RHODECODE ERROR]',
+                'exc_id': exc_traceback['exc_id'],
+                'exc_url': 'http://server-url/{}'.format(exc_traceback['exc_id']),
+                'exc_type_name': 'NameError',
+                'exc_traceback': exc_traceback,
+            },
             'password_reset': {
                 'password_reset_url': 'http://example.com/reset-rhodecode-password/token',
 
@@ -204,7 +220,7 b' def db():'
                 'pr_comment_url': 'http://comment-url',
                 'pr_comment_reply_url': 'http://comment-url#reply',
 
-                'comment_file': 'rhodecode/model/db.py',
+                'comment_file': 'rhodecode/model/get_flow_commits',
                 'comment_line': 'o1210',
                 'comment_type': 'todo',
                 'comment_body': '''

rhodecode/apps/file_store/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/backends/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/backends/local_store.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/config_keys.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/exceptions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/extensions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/tests/test_upload_file.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/file_store/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/gist/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/gist/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/gist/tests/test_admin_gists.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/gist/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2013-2019 RhodeCode GmbH
+# Copyright (C) 2013-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/home/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/home/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/home/tests/test_get_goto_switched_data.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/home/tests/test_get_repo_list_data.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/home/tests/test_get_user_data.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/home/tests/test_get_user_group_data.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -19,7 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/home/tests/test_home.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/home/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -35,8 +35,8 b' from rhodecode.lib.index import searcher'
 from rhodecode.lib.utils2 import safe_unicode, str2bool, safe_int
 from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.model.db import (
-    func, true, or_, case, in_filter_generator, Session,
-    Repository, RepoGroup, User, UserGroup)
+    func, true, or_, case, cast, in_filter_generator, String, Session,
+    Repository, RepoGroup, User, UserGroup, PullRequest)
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.user import UserModel
@@ -111,7 +111,7 b' class HomeView(BaseAppView, DataGridAppV'
         org_query = name_contains
         allowed_ids = self._rhodecode_user.repo_acl_ids(
             ['repository.read', 'repository.write', 'repository.admin'],
-            cache=False, name_filter=name_contains) or [-1]
+            cache=True, name_filter=name_contains) or [-1]
 
         query = Session().query(
                 Repository.repo_name,
@@ -162,7 +162,7 b' class HomeView(BaseAppView, DataGridAppV'
         org_query = name_contains
         allowed_ids = self._rhodecode_user.repo_group_acl_ids(
             ['group.read', 'group.write', 'group.admin'],
-            cache=False, name_filter=name_contains) or [-1]
+            cache=True, name_filter=name_contains) or [-1]
 
         query = Session().query(
                 RepoGroup.group_id,
@@ -282,6 +282,61 b' class HomeView(BaseAppView, DataGridAppV'
             }
             for obj in acl_iter], True
 
+    def _get_pull_request_list(self, name_contains=None, limit=20):
+        org_query = name_contains
+        if not name_contains:
+            return [], False
+
+        # TODO(marcink): should all logged in users be allowed to search others?
+        allowed_user_search = self._rhodecode_user.username != User.DEFAULT_USER
+        if not allowed_user_search:
+            return [], False
+
+        name_contains = re.compile('(?:pr:[ ]?)(.+)').findall(name_contains)
+        if len(name_contains) != 1:
+            return [], False
+
+        name_contains = name_contains[0]
+
+        allowed_ids = self._rhodecode_user.repo_acl_ids(
+            ['repository.read', 'repository.write', 'repository.admin'],
+            cache=True) or [-1]
+
+        query = Session().query(
+                PullRequest.pull_request_id,
+                PullRequest.title,
+            )
+        query = query.join(Repository, Repository.repo_id == PullRequest.target_repo_id)
+
+        query = query.filter(or_(
+            # generate multiple IN to fix limitation problems
+            *in_filter_generator(Repository.repo_id, allowed_ids)
+        ))
+
+        query = query.order_by(PullRequest.pull_request_id)
+
+        if name_contains:
+            ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
+            query = query.filter(or_(
+                cast(PullRequest.pull_request_id, String).ilike(ilike_expression),
+                PullRequest.title.ilike(ilike_expression),
+                PullRequest.description.ilike(ilike_expression),
+            ))
+
+            query = query.limit(limit)
+
+        acl_iter = query
+
+        return [
+            {
+                'id': obj.pull_request_id,
+                'value': org_query,
+                'value_display': 'pull request: `!{} - {}`'.format(obj.pull_request_id, obj.title[:50]),
+                'type': 'pull_request',
+                'url': h.route_path('pull_requests_global', pull_request_id=obj.pull_request_id)
+            }
+            for obj in acl_iter], True
+
     def _get_hash_commit_list(self, auth_user, searcher, query, repo=None, repo_group=None):
         repo_name = repo_group_name = None
         if repo:
@@ -624,6 +679,17 b' class HomeView(BaseAppView, DataGridAppV'
                 has_specialized_search = True
                 res.append(no_match('No matching user groups found'))
 
+        # pr: type search
+        if not prefix_match:
+            pull_requests, prefix_match = self._get_pull_request_list(query)
+            if pull_requests:
+                has_specialized_search = True
+                for serialized_pull_request in pull_requests:
+                    res.append(serialized_pull_request)
+            elif prefix_match:
+                has_specialized_search = True
+                res.append(no_match('No matching pull requests found'))
+
         # FTS commit: type search
         if not prefix_match:
             commits, prefix_match = self._get_hash_commit_list(

rhodecode/apps/hovercards/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2018-2019 RhodeCode GmbH
+# Copyright (C) 2018-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/hovercards/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/journal/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/journal/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/journal/tests/test_journal.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/journal/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/login/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/login/tests/test_login.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/login/tests/test_password_reset.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/login/tests/test_register_captcha.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/login/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -50,6 +50,9 b' def includeme(config):'
         name='my_account_auth_tokens',
         pattern=ADMIN_PREFIX + '/my_account/auth_tokens')
     config.add_route(
+        name='my_account_auth_tokens_view',
+        pattern=ADMIN_PREFIX + '/my_account/auth_tokens/view')
+    config.add_route(
         name='my_account_auth_tokens_add',
         pattern=ADMIN_PREFIX + '/my_account/auth_tokens/new')
     config.add_route(

rhodecode/apps/my_account/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/tests/test_my_account_auth_tokens.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -49,7 +49,7 b' class TestMyAccountAuthTokens(TestContro'
         user = User.get(usr['user_id'])
         response = self.app.get(route_path('my_account_auth_tokens'))
         for token in user.auth_tokens:
-            response.mustcontain(token)
+            response.mustcontain(token[:4])
             response.mustcontain('never')
 
     def test_my_account_add_auth_tokens_wrong_csrf(self, user_util):
@@ -79,7 +79,7 b' class TestMyAccountAuthTokens(TestContro'
         response = response.follow()
         user = User.get(user_id)
         for auth_token in user.auth_tokens:
-            response.mustcontain(auth_token)
+            response.mustcontain(auth_token[:4])
 
     def test_my_account_delete_auth_token(self, user_util):
         user = user_util.create_user(password='qweqwe')

rhodecode/apps/my_account/tests/test_my_account_edit.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -19,7 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/tests/test_my_account_emails.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/tests/test_my_account_notifications.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/tests/test_my_account_password.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/tests/test_my_account_profile.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/tests/test_my_account_simple_views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/tests/test_my_account_ssh_keys.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/views/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/views/my_account.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -25,7 +25,7 b' import string'
 import formencode
 import formencode.htmlfill
 import peppercorn
-from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPFound, HTTPNotFound
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView, DataGridAppView
@@ -164,6 +164,27 b' class MyAccountView(BaseAppView, DataGri'
         c.role_vcs = AuthTokenModel.cls.ROLE_VCS
         return self._get_template_context(c)
 
+    @LoginRequired()
+    @NotAnonymous()
+    @CSRFRequired()
+    @view_config(
+        route_name='my_account_auth_tokens_view', request_method='POST', xhr=True,
+        renderer='json_ext')
+    def my_account_auth_tokens_view(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+
+        auth_token_id = self.request.POST.get('auth_token_id')
+
+        if auth_token_id:
+            token = UserApiKeys.get_or_404(auth_token_id)
+            if token.user.user_id != c.user.user_id:
+                raise HTTPNotFound()
+
+            return {
+                'auth_token': token.api_key
+            }
+
     def maybe_attach_token_scope(self, token):
         # implemented in EE edition
         pass
@@ -702,12 +723,12 b' class MyAccountView(BaseAppView, DataGri'
 
         pull_requests = PullRequestModel().get_im_participating_in(
             user_id=self._rhodecode_user.user_id,
-            statuses=statuses,
+            statuses=statuses, query=search_q,
             offset=start, length=limit, order_by=order_by,
             order_dir=order_dir)
 
         pull_requests_total_count = PullRequestModel().count_im_participating_in(
-            user_id=self._rhodecode_user.user_id, statuses=statuses)
+            user_id=self._rhodecode_user.user_id, statuses=statuses, query=search_q)
 
         data = []
         comments_model = CommentsModel()

rhodecode/apps/my_account/views/my_account_notifications.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/my_account/views/my_account_ssh_keys.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ops/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ops/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/tests/test_repo_groups_advanced.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/tests/test_repo_groups_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/views/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/views/repo_group_advanced.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/views/repo_group_permissions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repo_group/views/repo_group_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -156,6 +156,10 b' def includeme(config):'
         pattern='/{repo_name:.*?[^/]}/authors/{commit_id}/{f_path:.*}', repo_route=True)
 
     config.add_route(
+        name='repo_files_check_head',
+        pattern='/{repo_name:.*?[^/]}/check_head/{commit_id}/{f_path:.*}',
+        repo_route=True)
+    config.add_route(
         name='repo_files_remove_file',
         pattern='/{repo_name:.*?[^/]}/remove_file/{commit_id}/{f_path:.*}',
         repo_route=True)

rhodecode/apps/repository/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_pull_requests_list.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_bookmarks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_branches.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_changelog.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_commit_comments.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -22,8 +22,7 b' import pytest'
 
 from rhodecode.tests import TestController
 
-from rhodecode.model.db import (
-    ChangesetComment, Notification, UserNotification)
+from rhodecode.model.db import ChangesetComment, Notification
 from rhodecode.model.meta import Session
 from rhodecode.lib import helpers as h
 
@@ -269,7 +268,36 b' class TestRepoCommitCommentsView(TestCon'
                        repo_name=backend.repo_name, commit_id=commit_id))
         assert_comment_links(response, 0, 0)
 
-    @pytest.mark.parametrize('renderer, input, output', [
+    def test_delete_forbidden_for_immutable_comments(self, backend):
+        self.log_user()
+        commit_id = backend.repo.get_commit('300').raw_id
+        text = u'CommentOnCommit'
+
+        params = {'text': text, 'csrf_token': self.csrf_token}
+        self.app.post(
+            route_path(
+                'repo_commit_comment_create',
+                repo_name=backend.repo_name, commit_id=commit_id),
+            params=params)
+
+        comments = ChangesetComment.query().all()
+        assert len(comments) == 1
+        comment_id = comments[0].comment_id
+
+        comment = ChangesetComment.get(comment_id)
+        comment.immutable_state = ChangesetComment.OP_IMMUTABLE
+        Session().add(comment)
+        Session().commit()
+
+        self.app.post(
+            route_path('repo_commit_comment_delete',
+                       repo_name=backend.repo_name,
+                       commit_id=commit_id,
+                       comment_id=comment_id),
+            params={'csrf_token': self.csrf_token},
+            status=403)
+
+    @pytest.mark.parametrize('renderer, text_input, output', [
         ('rst', 'plain text', '<p>plain text</p>'),
         ('rst', 'header\n======', '<h1 class="title">header</h1>'),
         ('rst', '*italics*', '<em>italics</em>'),
@@ -280,11 +308,11 b' class TestRepoCommitCommentsView(TestCon'
         ('markdown', '**bold**', '<strong>bold</strong>'),
     ], ids=['rst-plain', 'rst-header', 'rst-italics', 'rst-bold', 'md-plain',
             'md-header', 'md-italics', 'md-bold', ])
-    def test_preview(self, renderer, input, output, backend, xhr_header):
+    def test_preview(self, renderer, text_input, output, backend, xhr_header):
         self.log_user()
         params = {
             'renderer': renderer,
-            'text': input,
+            'text': text_input,
             'csrf_token': self.csrf_token
         }
         commit_id = '0' * 16  # fake this for tests

rhodecode/apps/repository/tests/test_repo_commits.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_compare.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -484,7 +484,7 b' class TestCompareView(object):'
 
         # outgoing commits between those commits
         compare_page = ComparePage(response)
-        compare_page.contains_commits(commits=[commit1], ancestors=[commit0])
+        compare_page.contains_commits(commits=[commit1])
 
     def test_errors_when_comparing_unknown_source_repo(self, backend):
         repo = backend.repo
@@ -641,6 +641,7 b' class ComparePage(AssertResponse):'
             self.contains_one_link(
                 'r%s:%s' % (commit.idx, commit.short_id),
                 self._commit_url(commit))
+
         if ancestors:
             response.mustcontain('Ancestor')
             for ancestor in ancestors:

rhodecode/apps/repository/tests/test_repo_compare_local.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_compare_on_single_file.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_feed.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_files.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_forks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_issue_tracker.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_permissions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_pullrequests.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -629,7 +629,7 b' class TestPullrequestsView(object):'
         model_patcher = mock.patch.multiple(
             PullRequestModel,
             merge_repo=mock.Mock(return_value=merge_resp),
-            merge_status=mock.Mock(return_value=(True, 'WRONG_MESSAGE')))
+            merge_status=mock.Mock(return_value=(None, True, 'WRONG_MESSAGE')))
 
         with model_patcher:
             response = self.app.post(
@@ -891,6 +891,8 b' class TestPullrequestsView(object):'
 
         vcs = repo.scm_instance()
         vcs.remove_ref('refs/heads/{}'.format(branch_name))
+        # NOTE(marcink): run GC to ensure the commits are gone
+        vcs.run_gc()
 
         response = self.app.get(route_path(
             'pullrequest_show',

rhodecode/apps/repository/tests/test_repo_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_settings_advanced.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_summary.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_tags.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_repo_vcs_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/tests/test_vcs_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -20,6 +20,9 b''
 
 from rhodecode.lib import helpers as h
 from rhodecode.lib.utils2 import safe_int
+from rhodecode.model.pull_request import get_diff_info
+
+REVIEWER_API_VERSION = 'V3'
 
 
 def reviewer_as_json(user, reasons=None, mandatory=False, rules=None, user_group=None):
@@ -47,15 +50,20 b' def reviewer_as_json(user, reasons=None,'
 
 def get_default_reviewers_data(
         current_user, source_repo, source_commit, target_repo, target_commit):
+    """
+    Return json for default reviewers of a repository
+    """
 
-    """ Return json for default reviewers of a repository """
+    diff_info = get_diff_info(
+        source_repo, source_commit.raw_id, target_repo, target_commit.raw_id)
 
     reasons = ['Default reviewer', 'Repository owner']
     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
+        'api_ver': REVIEWER_API_VERSION,  # define version for later possible schema upgrade
+        'diff_info': diff_info,
         'reviewers': json_reviewers,
         'rules': {},
         'rules_data': {},

rhodecode/apps/repository/views/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_artifacts.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_audit_logs.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2019 RhodeCode GmbH
+# Copyright (C) 2017-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_automation.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_bookmarks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_branch_permissions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_branches.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_caches.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_changelog.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_checks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_commits.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -22,7 +22,7 b''
 import logging
 import collections
 
-from pyramid.httpexceptions import HTTPNotFound, HTTPBadRequest, HTTPFound
+from pyramid.httpexceptions import HTTPNotFound, HTTPBadRequest, HTTPFound, HTTPForbidden
 from pyramid.view import view_config
 from pyramid.renderers import render
 from pyramid.response import Response
@@ -380,6 +380,11 b' class RepoCommitsView(RepoAppView):'
                         'repo_commit', repo_name=self.db_repo_name,
                         commit_id=current_id))
 
+            commit = self.db_repo.get_commit(current_id)
+            CommentsModel().trigger_commit_comment_hook(
+                self.db_repo, self._rhodecode_user, 'create',
+                data={'comment': comment, 'commit': commit})
+
         # finalize, commit and redirect
         Session().commit()
 
@@ -533,6 +538,10 b' class RepoCommitsView(RepoAppView):'
             # comment already deleted in another call probably
             return True
 
+        if comment.immutable:
+            # don't allow deleting comments that are immutable
+            raise HTTPForbidden()
+
         is_repo_admin = h.HasRepoPermissionAny('repository.admin')(self.db_repo_name)
         super_admin = h.HasPermissionAny('hg.admin')()
         comment_owner = (comment.author.user_id == self._rhodecode_db_user.user_id)

rhodecode/apps/repository/views/repo_compare.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_feed.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2019 RhodeCode GmbH
+# Copyright (C) 2017-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_files.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -245,7 +245,7 b' class RepoFilesView(RepoAppView):'
 
         return branch_name, sha_commit_id, is_head
 
-    def _get_tree_at_commit(self, c, commit_id, f_path, full_load=False):
+    def _get_tree_at_commit(self, c, commit_id, f_path, full_load=False, at_rev=None):
 
         repo_id = self.db_repo.repo_id
         force_recache = self.get_recache_flag()
@@ -261,19 +261,19 b' class RepoFilesView(RepoAppView):'
         cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
         region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
 
-        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
-                                               condition=cache_on)
-        def compute_file_tree(ver, repo_id, commit_id, f_path, full_load):
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid, condition=cache_on)
+        def compute_file_tree(ver, _name_hash, _repo_id, _commit_id, _f_path, _full_load, _at_rev):
             log.debug('Generating cached file tree at ver:%s for repo_id: %s, %s, %s',
-                      ver, repo_id, commit_id, f_path)
+                      ver, _repo_id, _commit_id, _f_path)
 
-            c.full_load = full_load
+            c.full_load = _full_load
             return render(
                 'rhodecode:templates/files/files_browser_tree.mako',
-                self._get_template_context(c), self.request)
+                self._get_template_context(c), self.request, _at_rev)
 
         return compute_file_tree(
-            rc_cache.FILE_TREE_CACHE_VER, self.db_repo.repo_id, commit_id, f_path, full_load)
+            rc_cache.FILE_TREE_CACHE_VER, self.db_repo.repo_name_hash,
+            self.db_repo.repo_id, commit_id, f_path, full_load, at_rev)
 
     def _get_archive_spec(self, fname):
         log.debug('Detecting archive spec for: `%s`', fname)
@@ -617,15 +617,12 b' class RepoFilesView(RepoAppView):'
         c.renderer = view_name == 'repo_files:rendered' or \
                         not self.request.GET.get('no-render', False)
 
-        # redirect to given commit_id from form if given
-        get_commit_id = self.request.GET.get('at_rev', None)
-        if get_commit_id:
-            self._get_commit_or_redirect(get_commit_id)
+        commit_id, f_path = self._get_commit_and_path()
 
-        commit_id, f_path = self._get_commit_and_path()
         c.commit = self._get_commit_or_redirect(commit_id)
         c.branch = self.request.GET.get('branch', None)
         c.f_path = f_path
+        at_rev = self.request.GET.get('at')
 
         # prev link
         try:
@@ -705,7 +702,7 b' class RepoFilesView(RepoAppView):'
                 c.authors = []
                 # this loads a simple tree without metadata to speed things up
                 # later via ajax we call repo_nodetree_full and fetch whole
-                c.file_tree = self._get_tree_at_commit(c, c.commit.raw_id, f_path)
+                c.file_tree = self._get_tree_at_commit(c, c.commit.raw_id, f_path, at_rev=at_rev)
 
                 c.readme_data, c.readme_file = \
                     self._get_readme_data(self.db_repo, c.visual.default_renderer,
@@ -782,9 +779,10 b' class RepoFilesView(RepoAppView):'
 
         c.file = dir_node
         c.commit = commit
+        at_rev = self.request.GET.get('at')
 
         html = self._get_tree_at_commit(
-            c, commit.raw_id, dir_node.path, full_load=True)
+            c, commit.raw_id, dir_node.path, full_load=True, at_rev=at_rev)
 
         return Response(html)
 
@@ -915,13 +913,12 b' class RepoFilesView(RepoAppView):'
         cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
         region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
 
-        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
-                                               condition=cache_on)
-        def compute_file_search(repo_id, commit_id, f_path):
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid, condition=cache_on)
+        def compute_file_search(_name_hash, _repo_id, _commit_id, _f_path):
             log.debug('Generating cached nodelist for repo_id:%s, %s, %s',
-                      repo_id, commit_id, f_path)
+                      _repo_id, commit_id, f_path)
             try:
-                _d, _f = ScmModel().get_quick_filter_nodes(repo_name, commit_id, f_path)
+                _d, _f = ScmModel().get_quick_filter_nodes(repo_name, _commit_id, _f_path)
             except (RepositoryError, CommitDoesNotExistError, Exception) as e:
                 log.exception(safe_str(e))
                 h.flash(safe_str(h.escape(e)), category='error')
@@ -931,7 +928,8 b' class RepoFilesView(RepoAppView):'
 
             return _d + _f
 
-        result = compute_file_search(self.db_repo.repo_id, commit_id, f_path)
+        result = compute_file_search(self.db_repo.repo_name_hash, self.db_repo.repo_id,
+                                     commit_id, f_path)
         return filter(lambda n: self.path_filter.path_access_allowed(n['name']), result)
 
     @LoginRequired()
@@ -961,6 +959,9 b' class RepoFilesView(RepoAppView):'
         return commit_id
 
     def _symbolic_reference_svn(self, commit_id, name, f_path, ref_type):
+        return commit_id
+
+        # NOTE(dan): old code we used in "diff" mode compare
         new_f_path = vcspath.join(name, f_path)
         return u'%s@%s' % (new_f_path, commit_id)
 
@@ -1035,10 +1036,24 b' class RepoFilesView(RepoAppView):'
             file_history, _hist = self._get_node_history(commit, f_path)
 
             res = []
-            for obj in file_history:
+            for section_items, section in file_history:
+                items = []
+                for obj_id, obj_text, obj_type in section_items:
+                    at_rev = ''
+                    if obj_type in ['branch', 'bookmark', 'tag']:
+                        at_rev = obj_text
+                    entry = {
+                        'id': obj_id,
+                        'text': obj_text,
+                        'type': obj_type,
+                        'at_rev': at_rev
+                    }
+
+                    items.append(entry)
+
                 res.append({
-                    'text': obj[1],
-                    'children': [{'id': o[0], 'text': o[1], 'type': o[2]} for o in obj[0]]
+                    'text': section,
+                    'children': items
                 })
 
             data = {
@@ -1098,6 +1113,42 b' class RepoFilesView(RepoAppView):'
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @view_config(
+        route_name='repo_files_check_head', request_method='POST',
+        renderer='json_ext', xhr=True)
+    def repo_files_check_head(self):
+        self.load_default_context()
+
+        commit_id, f_path = self._get_commit_and_path()
+        _branch_name, _sha_commit_id, is_head = \
+            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+
+        new_path = self.request.POST.get('path')
+        operation = self.request.POST.get('operation')
+        path_exist = ''
+
+        if new_path and operation in ['create', 'upload']:
+            new_f_path = os.path.join(f_path.lstrip('/'), new_path)
+            try:
+                commit_obj = self.rhodecode_vcs_repo.get_commit(commit_id)
+                # NOTE(dan): construct whole path without leading /
+                file_node = commit_obj.get_node(new_f_path)
+                if file_node is not None:
+                    path_exist = new_f_path
+            except EmptyRepositoryError:
+                pass
+            except Exception:
+                pass
+
+        return {
+            'branch': _branch_name,
+            'sha': _sha_commit_id,
+            'is_head': is_head,
+            'path_exists': path_exist
+        }
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    @view_config(
         route_name='repo_files_remove_file', request_method='GET',
         renderer='rhodecode:templates/files/files_delete.mako')
     def repo_files_remove_file(self):

rhodecode/apps/repository/views/repo_forks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_maintainance.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_permissions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -114,21 +114,26 b' class RepoSettingsPermissionsView(RepoAp'
         private_flag = str2bool(self.request.POST.get('private'))
 
         try:
-            RepoModel().update(
-                self.db_repo, **{'repo_private': private_flag, 'repo_name': self.db_repo_name})
+            repo = RepoModel().get(self.db_repo.repo_id)
+            repo.private = private_flag
+            Session().add(repo)
+            RepoModel().grant_user_permission(
+                repo=self.db_repo, user=User.DEFAULT_USER, perm='repository.none'
+            )
+
             Session().commit()
 
             h.flash(_('Repository `{}` private mode set successfully').format(self.db_repo_name),
                     category='success')
+            # NOTE(dan): we change repo private mode we need to notify all USERS
+            affected_user_ids = User.get_all_user_ids()
+            PermissionModel().trigger_permission_flush(affected_user_ids)
+
         except Exception:
             log.exception("Exception during update of repository")
             h.flash(_('Error occurred during update of repository {}').format(
                 self.db_repo_name), category='error')
 
-        # NOTE(dan): we change repo private mode we need to notify all USERS
-        affected_user_ids = User.get_all_user_ids()
-        PermissionModel().trigger_permission_flush(affected_user_ids)
-
         return {
             'redirect_url': h.route_path('edit_repo_perms', repo_name=self.db_repo_name),
             'private': private_flag

rhodecode/apps/repository/views/repo_pull_requests.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -40,12 +40,12 b' from rhodecode.lib.auth import ('
     NotAnonymous, CSRFRequired)
 from rhodecode.lib.utils2 import str2bool, safe_str, safe_unicode
 from rhodecode.lib.vcs.backends.base import EmptyCommit, UpdateFailureReason
-from rhodecode.lib.vcs.exceptions import (CommitDoesNotExistError,
-    RepositoryRequirementError, EmptyRepositoryError)
+from rhodecode.lib.vcs.exceptions import (
+    CommitDoesNotExistError, RepositoryRequirementError, EmptyRepositoryError)
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.comment import CommentsModel
-from rhodecode.model.db import (func, or_, PullRequest, PullRequestVersion,
-    ChangesetComment, ChangesetStatus, Repository)
+from rhodecode.model.db import (
+    func, or_, PullRequest, ChangesetComment, ChangesetStatus, Repository)
 from rhodecode.model.forms import PullRequestForm
 from rhodecode.model.meta import Session
 from rhodecode.model.pull_request import PullRequestModel, MergeCheck
@@ -210,10 +210,12 b' class RepoPullRequestsView(RepoAppView, '
         return caching_enabled
 
     def _get_diffset(self, source_repo_name, source_repo,
+                     ancestor_commit,
                      source_ref_id, target_ref_id,
                      target_commit, source_commit, diff_limit, file_limit,
                      fulldiff, hide_whitespace_changes, diff_context):
 
+        target_ref_id = ancestor_commit.raw_id
         vcs_diff = PullRequestModel().get_diff(
             source_repo, source_ref_id, target_ref_id,
             hide_whitespace_changes, diff_context)
@@ -278,6 +280,7 b' class RepoPullRequestsView(RepoAppView, '
         _new_state = {
             'created': PullRequest.STATE_CREATED,
         }.get(self.request.GET.get('force_state'))
+
         if c.is_super_admin and _new_state:
             with pull_request.set_state(PullRequest.STATE_UPDATING, final_state=_new_state):
                 h.flash(
@@ -396,9 +399,12 b' class RepoPullRequestsView(RepoAppView, '
             pull_request_latest, auth_user=self._rhodecode_user,
             translator=self.request.translate,
             force_shadow_repo_refresh=force_refresh)
+
         c.pr_merge_errors = _merge_check.error_details
         c.pr_merge_possible = not _merge_check.failed
         c.pr_merge_message = _merge_check.merge_msg
+        c.pr_merge_source_commit = _merge_check.source_commit
+        c.pr_merge_target_commit = _merge_check.target_commit
 
         c.pr_merge_info = MergeCheck.get_merge_conditions(
             pull_request_latest, translator=self.request.translate)
@@ -537,6 +543,13 b' class RepoPullRequestsView(RepoAppView, '
                 (ancestor_commit, commit_cache, missing_requirements,
                  source_commit, target_commit) = cached_diff['commits']
         else:
+            # NOTE(marcink): we reach potentially unreachable errors when a PR has
+            # merge errors resulting in potentially hidden commits in the shadow repo.
+            maybe_unreachable = _merge_check.MERGE_CHECK in _merge_check.error_details \
+                                and _merge_check.merge_response
+            maybe_unreachable = maybe_unreachable \
+                                and _merge_check.merge_response.metadata.get('unresolved_files')
+            log.debug("Using unreachable commits due to MERGE_CHECK in merge simulation")
             diff_commit_cache = \
                 (ancestor_commit, commit_cache, missing_requirements,
                  source_commit, target_commit) = self.get_commits(
@@ -547,7 +560,8 b' class RepoPullRequestsView(RepoAppView, '
                     source_scm,
                     target_commit,
                     target_ref_id,
-                    target_scm)
+                    target_scm,
+                maybe_unreachable=maybe_unreachable)
 
         # register our commit range
         for comm in commit_cache.values():
@@ -581,11 +595,10 b' class RepoPullRequestsView(RepoAppView, '
             has_proper_diff_cache = cached_diff and cached_diff.get('commits')
             if not force_recache and has_proper_diff_cache:
                 c.diffset = cached_diff['diff']
-                (ancestor_commit, commit_cache, missing_requirements,
-                 source_commit, target_commit) = cached_diff['commits']
             else:
                 c.diffset = self._get_diffset(
                     c.source_repo.repo_name, commits_source_repo,
+                    c.ancestor_commit,
                     source_ref_id, target_ref_id,
                     target_commit, source_commit,
                     diff_limit, file_limit, c.fulldiff,
@@ -665,8 +678,10 b' class RepoPullRequestsView(RepoAppView, '
 
             # calculate the diff for commits between versions
             c.commit_changes = []
-            mark = lambda cs, fw: list(
-                h.itertools.izip_longest([], cs, fillvalue=fw))
+
+            def mark(cs, fw):
+                return list(h.itertools.izip_longest([], cs, fillvalue=fw))
+
             for c_type, raw_id in mark(commit_changes.added, 'a') \
                                 + mark(commit_changes.removed, 'r') \
                                 + mark(commit_changes.common, 'c'):
@@ -698,15 +713,22 b' class RepoPullRequestsView(RepoAppView, '
 
     def get_commits(
             self, commits_source_repo, pull_request_at_ver, source_commit,
-            source_ref_id, source_scm, target_commit, target_ref_id, target_scm):
+            source_ref_id, source_scm, target_commit, target_ref_id, target_scm,
+            maybe_unreachable=False):
+
         commit_cache = collections.OrderedDict()
         missing_requirements = False
+
         try:
             pre_load = ["author", "date", "message", "branch", "parents"]
-            show_revs = pull_request_at_ver.revisions
-            for rev in show_revs:
-                comm = commits_source_repo.get_commit(
-                    commit_id=rev, pre_load=pre_load)
+
+            pull_request_commits = pull_request_at_ver.revisions
+            log.debug('Loading %s commits from %s',
+                      len(pull_request_commits), commits_source_repo)
+
+            for rev in pull_request_commits:
+                comm = commits_source_repo.get_commit(commit_id=rev, pre_load=pre_load,
+                                                      maybe_unreachable=maybe_unreachable)
                 commit_cache[comm.raw_id] = comm
 
             # Order here matters, we first need to get target, and then
@@ -715,22 +737,21 b' class RepoPullRequestsView(RepoAppView, '
                 commit_id=safe_str(target_ref_id))
 
             source_commit = commits_source_repo.get_commit(
-                commit_id=safe_str(source_ref_id))
+                commit_id=safe_str(source_ref_id), maybe_unreachable=True)
         except CommitDoesNotExistError:
-            log.warning(
-                'Failed to get commit from `{}` repo'.format(
-                    commits_source_repo), exc_info=True)
+            log.warning('Failed to get commit from `{}` repo'.format(
+                commits_source_repo), exc_info=True)
         except RepositoryRequirementError:
-            log.warning(
-                'Failed to get all required data from repo', exc_info=True)
+            log.warning('Failed to get all required data from repo', exc_info=True)
             missing_requirements = True
-        ancestor_commit = None
+
+        pr_ancestor_id = pull_request_at_ver.common_ancestor_id
+
         try:
-            ancestor_id = source_scm.get_common_ancestor(
-                source_commit.raw_id, target_commit.raw_id, target_scm)
-            ancestor_commit = source_scm.get_commit(ancestor_id)
+            ancestor_commit = source_scm.get_commit(pr_ancestor_id)
         except Exception:
             ancestor_commit = None
+
         return ancestor_commit, commit_cache, missing_requirements, source_commit, target_commit
 
     def assure_not_empty_repo(self):
@@ -934,6 +955,7 b' class RepoPullRequestsView(RepoAppView, '
         target_repo = _form['target_repo']
         target_ref = _form['target_ref']
         commit_ids = _form['revisions'][::-1]
+        common_ancestor_id = _form['common_ancestor']
 
         # find the ancestor for this pr
         source_db_repo = Repository.get_by_repo_name(_form['source_repo'])
@@ -1020,6 +1042,7 b' class RepoPullRequestsView(RepoAppView, '
                 target_repo=target_repo,
                 target_ref=target_ref,
                 revisions=commit_ids,
+                common_ancestor_id=common_ancestor_id,
                 reviewers=reviewers,
                 title=pullrequest_title,
                 description=description,
@@ -1458,6 +1481,10 b' class RepoPullRequestsView(RepoAppView, '
             self.request.matchdict['comment_id'])
         comment_id = comment.comment_id
 
+        if comment.immutable:
+            # don't allow deleting comments that are immutable
+            raise HTTPForbidden()
+
         if pull_request.is_closed():
             log.debug('comment: forbidden because pull request is closed')
             raise HTTPForbidden()

rhodecode/apps/repository/views/repo_review_rules.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -54,8 +54,20 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)
+
+        request = self.request
+        source_repo = self.db_repo
+        source_repo_name = source_repo.repo_name
+        target_repo_name = request.GET.get('target_repo', source_repo_name)
         target_repo = Repository.get_by_repo_name(target_repo_name)
+
+        source_ref = request.GET['source_ref']
+        target_ref = request.GET['target_ref']
+        source_commit = source_repo.get_commit(source_ref)
+        target_commit = target_repo.get_commit(target_ref)
+
+        current_user = request.user.get_instance()
         review_data = get_default_reviewers_data(
-            self.db_repo.user, None, None, target_repo, None)
+            current_user, source_repo, source_commit, target_repo, target_commit)
+
         return review_data

rhodecode/apps/repository/views/repo_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_settings_advanced.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -22,6 +22,7 b' import logging'
 
 from pyramid.view import view_config
 from pyramid.httpexceptions import HTTPFound
+from packaging.version import Version
 
 from rhodecode import events
 from rhodecode.apps._base import RepoAppView
@@ -64,12 +65,19 b' class RepoSettingsView(RepoAppView):'
         c = self.load_default_context()
         c.active = 'advanced'
 
-        c.default_user_id = User.get_default_user().user_id
+        c.default_user_id = User.get_default_user_id()
         c.in_public_journal = UserFollowing.query() \
             .filter(UserFollowing.user_id == c.default_user_id) \
             .filter(UserFollowing.follows_repository == self.db_repo).scalar()
 
         c.ver_info_dict = self.rhodecode_vcs_repo.get_hooks_info()
+        c.hooks_outdated = False
+
+        try:
+            if Version(c.ver_info_dict['pre_version']) < Version(c.rhodecode_version):
+                c.hooks_outdated = True
+        except Exception:
+            pass
 
         # update commit cache if GET flag is present
         if self.request.GET.get('update_commit_cache'):
@@ -212,7 +220,7 b' class RepoSettingsView(RepoAppView):'
         _ = self.request.translate
 
         try:
-            user_id = User.get_default_user().user_id
+            user_id = User.get_default_user_id()
             ScmModel().toggle_following_repo(self.db_repo.repo_id, user_id)
             h.flash(_('Updated repository visibility in public journal'),
                     category='success')

rhodecode/apps/repository/views/repo_settings_fields.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2019 RhodeCode GmbH
+# Copyright (C) 2017-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_settings_issue_trackers.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2019 RhodeCode GmbH
+# Copyright (C) 2017-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_settings_remote.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2019 RhodeCode GmbH
+# Copyright (C) 2017-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_settings_vcs.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2019 RhodeCode GmbH
+# Copyright (C) 2017-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_strip.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2019 RhodeCode GmbH
+# Copyright (C) 2017-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_summary.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/repository/views/repo_tags.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/search/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/search/tests/test_search.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/search/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -60,11 +60,10 b' def perform_search(request, tmpl_context'
         errors = e.children
 
     def url_generator(page_num):
-        q = urllib.quote(safe_str(search_query))
 
         query_params = {
             'page': page_num,
-            'q': q,
+            'q': safe_str(search_query),
             'type': safe_str(search_type),
             'max_lines': search_max_lines,
             'sort': search_sort
@@ -72,7 +71,6 b' def perform_search(request, tmpl_context'
 
         return '?' + urllib.urlencode(query_params)
 
-
     c = tmpl_context
     search_query = search_params.get('search_query')
     search_type = search_params.get('search_type')

rhodecode/apps/ssh_support/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/config_keys.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/events.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/lib/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

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

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -91,7 +91,6 b' class SshWrapper(object):'
 
     def get_repo_details(self, mode):
         vcs_type = mode if mode in ['svn', 'hg', 'git'] else None
-        mode = mode
         repo_name = None
 
         hg_pattern = r'^hg\s+\-R\s+(\S+)\s+serve\s+\-\-stdio$'
@@ -101,8 +100,7 b' class SshWrapper(object):'
             repo_name = hg_match.group(1).strip('/')
             return vcs_type, repo_name, mode
 
-        git_pattern = (
-            r'^git-(receive-pack|upload-pack)\s\'[/]?(\S+?)(|\.git)\'$')
+        git_pattern = r'^git-(receive-pack|upload-pack)\s\'[/]?(\S+?)(|\.git)\'$'
         git_match = re.match(git_pattern, self.command)
         if git_match is not None:
             vcs_type = 'git'
@@ -115,7 +113,8 b' class SshWrapper(object):'
 
         if svn_match is not None:
             vcs_type = 'svn'
-            # Repo name should be extracted from the input stream
+            # Repo name should be extracted from the input stream, we're unable to
+            # extract it at this point in execution
             return vcs_type, repo_name, mode
 
         return vcs_type, repo_name, mode
@@ -188,8 +187,7 b' class SshWrapper(object):'
         log.debug('SSH Connection info %s', self.get_connection_info())
 
         if shell and self.command is None:
-            log.info(
-                'Dropping to shell, no command given and shell is allowed')
+            log.info('Dropping to shell, no command given and shell is allowed')
             os.execl('/bin/bash', '-l')
             exit_code = 1
 
@@ -216,8 +214,7 b' class SshWrapper(object):'
             exit_code = -1
 
         else:
-            log.error(
-                'Unhandled Command: "%s" Aborting.', self.command)
+            log.error('Unhandled Command: "%s" Aborting.', self.command)
             exit_code = -1
 
         return exit_code

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

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -66,9 +66,8 b' class VcsServer(object):'
 
     def _check_permissions(self, action):
         permission = self.user_permissions.get(self.repo_name)
-        log.debug(
-            'permission for %s on %s are: %s',
-            self.user, self.repo_name, permission)
+        log.debug('permission for %s on %s are: %s',
+                  self.user, self.repo_name, permission)
 
         if not permission:
             log.error('user `%s` permissions to repo:%s are empty. Forbidding access.',

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

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -68,8 +68,7 b' class GitServer(VcsServer):'
         self.store = store
         self.ini_path = ini_path
         self.repo_name = repo_name
-        self._path = self.git_path = config.get(
-            'app:main', 'ssh.executable.git')
+        self._path = self.git_path = config.get('app:main', 'ssh.executable.git')
 
         self.repo_mode = repo_mode
         self.tunnel = GitTunnelWrapper(server=self)

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

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

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

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -67,9 +67,12 b' class SubversionTunnelWrapper(object):'
 
     def command(self):
         root = self.server.get_root_store()
+        username = self.server.user.username
+
         command = [
             self.server.svn_path, '-t',
             '--config-file', self.svn_conf_path,
+            '--tunnel-user', username,
             '-r', root]
         log.debug("Final CMD: %s", ' '.join(command))
         return command
@@ -95,9 +98,8 b' class SubversionTunnelWrapper(object):'
         signal.alarm(self.timeout)
         first_response = self._read_first_client_response()
         signal.alarm(0)
-        return (
-            self._parse_first_client_response(first_response)
-            if first_response else None)
+        return (self._parse_first_client_response(first_response)
+                if first_response else None)
 
     def patch_first_client_response(self, response, **kwargs):
         self.create_hooks_env()
@@ -112,9 +114,8 b' class SubversionTunnelWrapper(object):'
         self.process.stdin.write(buffer_)
 
     def fail(self, message):
-        print(
-            "( failure ( ( 210005 {message} 0: 0 ) ) )".format(
-                message=self._svn_string(message)))
+        print("( failure ( ( 210005 {message} 0: 0 ) ) )".format(
+            message=self._svn_string(message)))
         self.remove_configs()
         self.process.kill()
         return 1
@@ -139,6 +140,7 b' class SubversionTunnelWrapper(object):'
                 brackets_stack.pop()
             elif next_byte == " " and not brackets_stack:
                 break
+
         return buffer_
 
     def _parse_first_client_response(self, buffer_):
@@ -149,8 +151,7 b' class SubversionTunnelWrapper(object):'
         ( version:number ( cap:word ... ) url:string ? ra-client:string
            ( ? client:string ) )
 
-        Please check https://svn.apache.org/repos/asf/subversion/trunk/
-           subversion/libsvn_ra_svn/protocol
+        Please check https://svn.apache.org/repos/asf/subversion/trunk/subversion/libsvn_ra_svn/protocol
         """
         version_re = r'(?P<version>\d+)'
         capabilities_re = r'\(\s(?P<capabilities>[\w\d\-\ ]+)\s\)'
@@ -163,8 +164,35 b' class SubversionTunnelWrapper(object):'
                 version=version_re, capabilities=capabilities_re,
                 url=url_re, ra_client=ra_client_re, client=client_re))
         matcher = regex.match(buffer_)
+
         return matcher.groupdict() if matcher else None
 
+    def _match_repo_name(self, url):
+        """
+        Given an server url, try to match it against ALL known repository names.
+        This handles a tricky SVN case for SSH and subdir commits.
+        E.g if our repo name is my-svn-repo, a svn commit on file in a subdir would
+        result in the url with this subdir added.
+        """
+        # case 1 direct match, we don't do any "heavy" lookups
+        if url in self.server.user_permissions:
+            return url
+
+        log.debug('Extracting repository name from subdir path %s', url)
+        # case 2 we check all permissions, and match closes possible case...
+        # NOTE(dan): In this case we only know that url has a subdir parts, it's safe
+        # to assume that it will have the repo name as prefix, we ensure the prefix
+        # for similar repositories isn't matched by adding a /
+        # e.g subgroup/repo-name/ and subgroup/repo-name-1/ would work correct.
+        for repo_name in self.server.user_permissions:
+            repo_name_prefix = repo_name + '/'
+            if url.startswith(repo_name_prefix):
+                log.debug('Found prefix %s match, returning proper repository name',
+                          repo_name_prefix)
+                return repo_name
+
+        return
+
     def run(self, extras):
         action = 'pull'
         self.create_svn_config()
@@ -175,7 +203,8 b' class SubversionTunnelWrapper(object):'
             return self.fail("Repository name cannot be extracted")
 
         url_parts = urlparse.urlparse(first_response['url'])
-        self.server.repo_name = url_parts.path.strip('/')
+
+        self.server.repo_name = self._match_repo_name(url_parts.path.strip('/'))
 
         exit_code = self.server._check_permissions(action)
         if exit_code:
@@ -200,10 +229,10 b' class SubversionServer(VcsServer):'
             .__init__(user, user_permissions, config, env)
         self.store = store
         self.ini_path = ini_path
-        # this is set in .run() from input stream
+        # NOTE(dan): repo_name at this point is empty,
+        # this is set later in .run() based from parsed input stream
         self.repo_name = repo_name
-        self._path = self.svn_path = config.get(
-            'app:main', 'ssh.executable.svn')
+        self._path = self.svn_path = config.get('app:main', 'ssh.executable.svn')
 
         self.tunnel = SubversionTunnelWrapper(server=self)
 

rhodecode/apps/ssh_support/lib/ssh_wrapper.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/subscribers.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/tests/conftest.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/tests/test_server_git.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/tests/test_server_hg.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/tests/test_server_svn.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -70,8 +70,10 b' class TestSubversionServer(object):'
     def test_command(self, svn_server):
         server = svn_server.create()
         expected_command = [
-            svn_server.svn_path, '-t', '--config-file',
-            server.tunnel.svn_conf_path, '-r', svn_server.root
+            svn_server.svn_path, '-t',
+            '--config-file', server.tunnel.svn_conf_path,
+            '--tunnel-user', svn_server.user.username,
+            '-r', svn_server.root
         ]
 
         assert expected_command == server.tunnel.command()
@@ -89,6 +91,86 b' class TestSubversionServer(object):'
         result = server._check_permissions(action)
         assert result is code
 
+    @pytest.mark.parametrize('permissions, access_paths, expected_match', [
+        # not matched repository name
+        ({
+             'test-svn': ''
+         }, ['test-svn-1', 'test-svn-1/subpath'],
+         None),
+
+        # exact match
+        ({
+             'test-svn': ''
+         },
+         ['test-svn'],
+         'test-svn'),
+
+        # subdir commits
+        ({
+             'test-svn': ''
+         },
+         ['test-svn/foo',
+          'test-svn/foo/test-svn',
+          'test-svn/trunk/development.txt',
+          ],
+         'test-svn'),
+
+        # subgroups + similar patterns
+        ({
+             'test-svn': '',
+             'test-svn-1': '',
+             'test-svn-subgroup/test-svn': '',
+
+         },
+         ['test-svn-1',
+          'test-svn-1/foo/test-svn',
+          'test-svn-1/test-svn',
+          ],
+         'test-svn-1'),
+
+        # subgroups + similar patterns
+        ({
+             'test-svn-1': '',
+             'test-svn-10': '',
+             'test-svn-100': '',
+         },
+         ['test-svn-10',
+          'test-svn-10/foo/test-svn',
+          'test-svn-10/test-svn',
+          ],
+         'test-svn-10'),
+
+        # subgroups + similar patterns
+        ({
+             'name': '',
+             'nameContains': '',
+             'nameContainsThis': '',
+         },
+         ['nameContains',
+          'nameContains/This',
+          'nameContains/This/test-svn',
+          ],
+         'nameContains'),
+
+        # subgroups + similar patterns
+        ({
+             'test-svn': '',
+             'test-svn-1': '',
+             'test-svn-subgroup/test-svn': '',
+
+         },
+         ['test-svn-subgroup/test-svn',
+          'test-svn-subgroup/test-svn/foo/test-svn',
+          'test-svn-subgroup/test-svn/trunk/example.txt',
+          ],
+         'test-svn-subgroup/test-svn'),
+    ])
+    def test_repo_extraction_on_subdir(self, svn_server, permissions, access_paths, expected_match):
+        server = svn_server.create(user_permissions=permissions)
+        for path in access_paths:
+            repo_name = server.tunnel._match_repo_name(path)
+            assert repo_name == expected_match
+
     def test_run_returns_executes_command(self, svn_server):
         server = svn_server.create()
         from rhodecode.apps.ssh_support.lib.backends.svn import SubversionTunnelWrapper

rhodecode/apps/ssh_support/tests/test_ssh_authorized_keys_gen.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/tests/test_ssh_wrapper.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/ssh_support/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/svn_support/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/svn_support/config_keys.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/svn_support/events.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/svn_support/subscribers.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/svn_support/tests/test_mod_dav_svn_config.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/svn_support/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -37,7 +37,7 b' log = logging.getLogger(__name__)'
 
 def write_mod_dav_svn_config(settings):
     use_ssl = str2bool(settings['force_https'])
-
+    file_path = settings[config_keys.config_file_path]
     config = _render_mod_dav_svn_config(
         use_ssl=use_ssl,
         parent_path_root=get_rhodecode_base_path(),
@@ -45,7 +45,8 b' def write_mod_dav_svn_config(settings):'
         location_root=settings[config_keys.location_root],
         repo_groups=RepoGroup.get_all_repo_groups(),
         realm=get_rhodecode_realm(), template=settings[config_keys.template])
-    _write_mod_dav_svn_config(config, settings[config_keys.config_file_path])
+    _write_mod_dav_svn_config(config, file_path)
+    return file_path
 
 
 def generate_mod_dav_svn_config(registry):
@@ -56,11 +57,11 b' def generate_mod_dav_svn_config(registry'
     repositories organized in sub folders.
     """
     settings = registry.settings
-    write_mod_dav_svn_config(settings)
+    file_path = write_mod_dav_svn_config(settings)
 
     # Trigger an event on mod dav svn configuration change.
     trigger(ModDavSvnConfigChange(), registry)
-
+    return file_path
 
 def _render_mod_dav_svn_config(
         parent_path_root, list_parent_path, location_root, repo_groups, realm,

rhodecode/apps/user_group/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group/tests/test_user_groups.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group/tests/test_user_groups_permissions.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group/views/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group_profile/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group_profile/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group_profile/tests/test_user_group.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_group_profile/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_profile/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_profile/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_profile/tests/test_users.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/apps/user_profile/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/base.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/interface.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/auth_crowd.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -153,25 +153,25 b' class CrowdServer(object):'
         global msg
         msg = ""
         try:
-            rdoc = self.opener.open(request)
-            msg = "".join(rdoc.readlines())
+            ret_doc = self.opener.open(request)
+            msg = ret_doc.read()
             if not msg and empty_response_ok:
-                rval = {}
-                rval["status"] = True
-                rval["error"] = "Response body was empty"
+                ret_val = {}
+                ret_val["status"] = True
+                ret_val["error"] = "Response body was empty"
             elif not noformat:
-                rval = json.loads(msg)
-                rval["status"] = True
+                ret_val = json.loads(msg)
+                ret_val["status"] = True
             else:
-                rval = "".join(rdoc.readlines())
+                ret_val = msg
         except Exception as e:
             if not noformat:
-                rval = {"status": False,
-                        "body": body,
-                        "error": str(e) + "\n" + msg}
+                ret_val = {"status": False,
+                           "body": body,
+                           "error": "{}\n{}".format(e, msg)}
             else:
-                rval = None
-        return rval
+                ret_val = None
+        return ret_val
 
     def user_auth(self, username, password):
         """Authenticate a user against crowd. Returns brief information about

rhodecode/authentication/plugins/auth_headers.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/auth_jasig_cas.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/auth_ldap.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -69,6 +69,12 b' class LdapAuthnResource(AuthnPluginResou'
 class AuthLdap(AuthLdapBase):
     default_tls_cert_dir = '/etc/openldap/cacerts'
 
+    scope_labels = {
+        ldap.SCOPE_BASE: 'SCOPE_BASE',
+        ldap.SCOPE_ONELEVEL: 'SCOPE_ONELEVEL',
+        ldap.SCOPE_SUBTREE: 'SCOPE_SUBTREE',
+    }
+
     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,
@@ -85,7 +91,7 b' class AuthLdap(AuthLdapBase):'
         self.TLS_KIND = tls_kind
 
         if self.TLS_KIND == 'LDAPS':
-            port = port or 689
+            port = port or 636
             self.ldap_server_type += 's'
 
         OPT_X_TLS_DEMAND = 2
@@ -148,19 +154,27 b' class AuthLdap(AuthLdapBase):'
         log.debug('simple_bind successful')
         return ldap_conn
 
-    def fetch_attrs_from_simple_bind(self, server, dn, username, password):
+    def fetch_attrs_from_simple_bind(self, ldap_conn, dn, username, password):
+        scope = ldap.SCOPE_BASE
+        scope_label = self.scope_labels.get(scope)
+        ldap_filter = '(objectClass=*)'
+
         try:
-            log.debug('Trying simple bind with %r', dn)
-            server.simple_bind_s(dn, safe_str(password))
-            _dn, attrs = server.search_ext_s(
-                dn, ldap.SCOPE_BASE, '(objectClass=*)', )[0]
+            log.debug('Trying authenticated search bind with dn: %r SCOPE: %s (and filter: %s)',
+                      dn, scope_label, ldap_filter)
+            ldap_conn.simple_bind_s(dn, safe_str(password))
+            response = ldap_conn.search_ext_s(dn, scope, ldap_filter, attrlist=['*', '+'])
 
-            return attrs
+            if not response:
+                log.error('search bind returned empty results: %r', response)
+                return {}
+            else:
+                _dn, attrs = response[0]
+                return attrs
 
         except ldap.INVALID_CREDENTIALS:
-            log.debug(
-                "LDAP rejected password for user '%s': %s, org_exc:",
-                username, dn, exc_info=True)
+            log.debug("LDAP rejected password for user '%s': %s, org_exc:",
+                      username, dn, exc_info=True)
 
     def authenticate_ldap(self, username, password):
         """
@@ -179,35 +193,38 b' class AuthLdap(AuthLdapBase):'
 
         self.validate_password(username, password)
         self.validate_username(username)
+        scope_label = self.scope_labels.get(self.SEARCH_SCOPE)
 
         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_)
+            log.debug("Authenticating %r filter %s and scope: %s",
+                      self.BASE_DN, filter_, scope_label)
 
-            lobjects = ldap_conn.search_ext_s(
-                self.BASE_DN, self.SEARCH_SCOPE, filter_)
+            ldap_objects = ldap_conn.search_ext_s(
+                self.BASE_DN, self.SEARCH_SCOPE, filter_, attrlist=['*', '+'])
 
-            if not lobjects:
+            if not ldap_objects:
                 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:
+            log.debug('Found %s matching ldap object[s], trying to authenticate on each one now...', len(ldap_objects))
+            for (dn, _attrs) in ldap_objects:
                 if dn is None:
                     continue
 
                 user_attrs = self.fetch_attrs_from_simple_bind(
                     ldap_conn, dn, username, password)
+
                 if user_attrs:
+                    log.debug('Got authenticated user attributes from DN:%s', dn)
                     break
             else:
                 raise LdapPasswordError(
-                    'Failed to authenticate user `{}` '
-                    'with given password'.format(username))
+                    '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:",
@@ -216,8 +233,7 b' class AuthLdap(AuthLdapBase):'
         except ldap.SERVER_DOWN:
             org_exc = traceback.format_exc()
             raise LdapConnectionError(
-                "LDAP can't access authentication "
-                "server, org_exc:%s" % org_exc)
+                "LDAP can't access authentication server, org_exc:%s" % org_exc)
         finally:
             if ldap_conn:
                 log.debug('ldap: connection release')
@@ -249,7 +265,7 b' class LdapSettingsSchema(AuthnPluginSett'
         colander.Int(),
         default=389,
         description=_('Custom port that the LDAP server is listening on. '
-                      'Default value is: 389, use 689 for LDAPS (SSL)'),
+                      'Default value is: 389, use 636 for LDAPS (SSL)'),
         preparer=strip_whitespace,
         title=_('Port'),
         validator=colander.Range(min=0, max=65536),

rhodecode/authentication/plugins/auth_pam.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/auth_rhodecode.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/plugins/auth_token.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/registry.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/routes.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/schema.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/tests/conftest.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/tests/functional/test_settings.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/authentication/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/conf.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2013-2019 RhodeCode GmbH
+# Copyright (C) 2013-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/environment.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -60,10 +60,15 b' def load_pyramid_environment(global_conf'
 
     load_rcextensions(root_path=settings_merged['here'])
 
-    # Limit backends to `vcs.backends` from configuration
+    # Limit backends to `vcs.backends` from configuration, and preserve the order
     for alias in rhodecode.BACKENDS.keys():
         if alias not in settings['vcs.backends']:
             del rhodecode.BACKENDS[alias]
+
+    _sorted_backend = sorted(rhodecode.BACKENDS.items(),
+                             key=lambda item: settings['vcs.backends'].index(item[0]))
+    rhodecode.BACKENDS = rhodecode.OrderedDict(_sorted_backend)
+
     log.info('Enabled VCS backends: %s', rhodecode.BACKENDS.keys())
 
     # initialize vcs client and optionally run the server if enabled
@@ -76,6 +81,7 b' def load_pyramid_environment(global_conf'
 
     rhodecode.PYRAMID_SETTINGS = settings_merged
     rhodecode.CONFIG = settings_merged
+    rhodecode.CONFIG['default_user_id'] = utils.get_default_user_id()
 
     if vcs_server_enabled:
         connect_vcs(vcs_server_uri, utils.get_vcs_server_protocol(settings))

rhodecode/config/jsroutes.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/middleware.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -611,6 +611,14 b' def _sanitize_cache_settings(settings):'
         settings,
         'exception_tracker.store_path',
         temp_store, lower=False, default_when_empty=True)
+    _bool_setting(
+        settings,
+        'exception_tracker.send_email',
+        'false')
+    _string_setting(
+        settings,
+        'exception_tracker.email_prefix',
+        '[RHODECODE ERROR]', lower=False, default_when_empty=True)
 
     # cache_perms
     _string_setting(

rhodecode/config/patches.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/rcextensions/__init__.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -25,6 +25,7 b' from .hooks import ('
     _create_repo_group_hook,
     _pre_create_user_hook,
     _create_user_hook,
+    _comment_commit_repo_hook,
     _delete_repo_hook,
     _delete_user_hook,
     _pre_push_hook,
@@ -33,6 +34,7 b' from .hooks import ('
     _pull_hook,
     _create_pull_request_hook,
     _review_pull_request_hook,
+    _comment_pull_request_hook,
     _update_pull_request_hook,
     _merge_pull_request_hook,
     _close_pull_request_hook,
@@ -40,6 +42,7 b' from .hooks import ('
 
 # set as module attributes, we use those to call hooks. *do not change this*
 CREATE_REPO_HOOK = _create_repo_hook
+COMMENT_COMMIT_REPO_HOOK = _comment_commit_repo_hook
 CREATE_REPO_GROUP_HOOK = _create_repo_group_hook
 PRE_CREATE_USER_HOOK = _pre_create_user_hook
 CREATE_USER_HOOK = _create_user_hook
@@ -51,6 +54,7 b' PRE_PULL_HOOK = _pre_pull_hook'
 PULL_HOOK = _pull_hook
 CREATE_PULL_REQUEST = _create_pull_request_hook
 REVIEW_PULL_REQUEST = _review_pull_request_hook
+COMMENT_PULL_REQUEST = _comment_pull_request_hook
 UPDATE_PULL_REQUEST = _update_pull_request_hook
 MERGE_PULL_REQUEST = _merge_pull_request_hook
 CLOSE_PULL_REQUEST = _close_pull_request_hook

rhodecode/config/rcextensions/examples/http_call_on_push.py

@@ -24,14 +24,13 b' def _push_hook(*args, **kwargs):'
     # returns list of dicts with key-val fetched from extra fields
     repo_extra_fields = extra_fields.run(**kwargs)
 
-    if repo_extra_fields.get('endpoint_url'):
-        field_metadata = repo_extra_fields['endpoint_url']
-        endpoint = field_metadata['field_value']
-        if endpoint:
-            data = {
-                'project': kwargs['repository'],
-            }
-            response = http_call.run(url=endpoint, params=data)
-            return HookResponse(0, 'Called endpoint {}, with response {}\n'.format(endpoint, response))
+    endpoint_url = extra_fields.get_field(repo_extra_fields, key='endpoint_url', default='')
+
+    if endpoint_url:
+        data = {
+            'project': kwargs['repository'],
+        }
+        response = http_call.run(url=endpoint_url, params=data)
+        return HookResponse(0, 'Called endpoint {}, with response {}\n'.format(endpoint_url, response))
 
     return HookResponse(0, '')

rhodecode/config/rcextensions/examples/trigger_ci_call.py

@@ -24,14 +24,12 b' def _push_hook(*args, **kwargs):'
     # returns list of dicts with key-val fetched from extra fields
     repo_extra_fields = extra_fields.run(**kwargs)
 
-    if repo_extra_fields.get('endpoint_url'):
-        field_metadata = repo_extra_fields['endpoint_url']
-        endpoint = field_metadata['field_value']
-        if endpoint:
-            data = {
-                'some_key': 'val'
-            }
-            response = http_call.run(url=endpoint, json_data=data)
-            return HookResponse(0, 'Called endpoint {}, with response {}'.format(endpoint, response))
+    endpoint_url = extra_fields.get_field(repo_extra_fields, key='endpoint_url', default='')
+    if endpoint_url:
+        data = {
+            'some_key': 'val'
+        }
+        response = http_call.run(url=endpoint_url, json_data=data)
+        return HookResponse(0, 'Called endpoint {}, with response {}'.format(endpoint_url, response))
 
     return HookResponse(0, '')

rhodecode/config/rcextensions/examples/validate_commit_message_author.py

@@ -41,11 +41,13 b' def _pre_push_hook(*args, **kwargs):'
     repo_extra_fields = extra_fields.run(**kwargs)
 
     # optionally use 'extra fields' to control the logic per repo
-    validate_author = repo_extra_fields.get('validate_author', {}).get('field_value')
+    validate_author = extra_fields.get_field(
+        repo_extra_fields, key='validate_author', default=False)
     should_validate = str2bool(validate_author)
 
     # optionally store validation regex into extra fields
-    validation_regex = repo_extra_fields.get('validation_regex', {}).get('field_value')
+    validation_regex = extra_fields.get_field(
+        repo_extra_fields, key='validation_regex', default='')
 
     def validate_commit_message(commit_message, message_regex=None):
         """

rhodecode/config/rcextensions/examples/validate_pushed_files_name_and_size.py

@@ -44,13 +44,16 b' def _pre_push_hook(*args, **kwargs):'
 
     # optionally use 'extra fields' to control the logic per repo
     # e.g store a list of patterns to be forbidden e.g `*.exe, *.dump`
-    forbid_files = repo_extra_fields.get('forbid_files_glob', {}).get('field_value')
+    forbid_files = extra_fields.get_field(repo_extra_fields, key='forbid_files_glob',
+                                          convert_type=False, default=[])
     forbid_files = aslist(forbid_files)
 
     # forbid_files = ['*']  # example pattern
 
     # optionally get bytes limit for a single file, e.g 1024 for 1KB
-    forbid_size_over = repo_extra_fields.get('forbid_size_over', {}).get('field_value')
+    forbid_size_over = extra_fields.get_field(repo_extra_fields, key='forbid_size_over',
+                                              convert_type=False, default=0)
+
     forbid_size_over = int(forbid_size_over or 0)
 
     # forbid_size_over = 1024  # example 1024

rhodecode/config/rcextensions/helpers/__init__.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/rcextensions/helpers/extra_fields.py

@@ -1,5 +1,5 b''
 # -*- coding: utf-8 -*-
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -53,3 +53,36 b' def run(*args, **kwargs):'
         fields[field.field_key] = field.get_dict()
 
     return fields
+
+
+class _Undefined(object):
+    pass
+
+
+def get_field(extra_fields_data, key, default=_Undefined(), convert_type=True):
+    """
+    field_value = get_field(extra_fields, key='ci_endpoint_url', default='')
+    """
+    from ..utils import str2bool, aslist
+
+    if key not in extra_fields_data:
+        if isinstance(default, _Undefined):
+            raise ValueError('key {} not present in extra_fields'.format(key))
+        return default
+
+    # NOTE(dan): from metadata we get field_label, field_value, field_desc, field_type
+    field_metadata = extra_fields_data[key]
+
+    field_value = field_metadata['field_value']
+
+    # NOTE(dan): empty value, use default
+    if not field_value and not isinstance(default, _Undefined):
+        return default
+
+    if convert_type:
+        # 'str', 'unicode', 'list', 'tuple'
+        _type = field_metadata['field_type']
+        if _type in ['list', 'tuple']:
+            field_value = aslist(field_value)
+
+    return field_value

rhodecode/config/rcextensions/helpers/extract_post_commits.py

@@ -1,5 +1,5 b''
 # -*- coding: utf-8 -*-
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/rcextensions/helpers/extract_pre_commits.py

@@ -1,5 +1,5 b''
 # -*- coding: utf-8 -*-
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/rcextensions/helpers/extract_pre_files.py

@@ -1,5 +1,5 b''
 # -*- coding: utf-8 -*-
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/rcextensions/helpers/http_call.py

@@ -1,5 +1,5 b''
 # -*- coding: utf-8 -*-
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/rcextensions/hooks.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -15,11 +15,12 b''
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
+
 import logging
 from .utils import DotDict, HookResponse, has_kwargs
+
 log = logging.getLogger('rhodecode.' + __name__)
 
-
 # Config shortcut to keep, all configuration in one place
 # Example:  api_key = CONFIG.my_config.api_key
 CONFIG = DotDict(
@@ -55,13 +56,40 b' def _create_repo_hook(*args, **kwargs):'
 
 
 @has_kwargs({
-    'group_name': '', 
-    'group_parent_id': '', 
+    'repo_name': '',
+    'repo_type': '',
+    'description': '',
+    'private': '',
+    'created_on': '',
+    'enable_downloads': '',
+    'repo_id': '',
+    'user_id': '',
+    'enable_statistics': '',
+    'clone_uri': '',
+    'fork_id': '',
+    'group_id': '',
+    'created_by': '',
+    'repository': '',
+    'comment': '',
+    'commit': ''
+})
+def _comment_commit_repo_hook(*args, **kwargs):
+    """
+    POST CREATE REPOSITORY COMMENT ON COMMIT HOOK. This function will be executed after
+    a comment is made on this repository commit.
+
+    """
+    return HookResponse(0, '')
+
+
+@has_kwargs({
+    'group_name': '',
+    'group_parent_id': '',
     'group_description': '',
-    'group_id': '', 
-    'user_id': '', 
-    'created_by': '', 
-    'created_on': '', 
+    'group_id': '',
+    'user_id': '',
+    'created_by': '',
+    'created_on': '',
     'enable_locking': ''
 })
 def _create_repo_group_hook(*args, **kwargs):
@@ -73,13 +101,13 b' def _create_repo_group_hook(*args, **kwa'
 
 
 @has_kwargs({
-    'username': '', 
-    'password': '', 
-    'email': '', 
+    'username': '',
+    'password': '',
+    'email': '',
     'firstname': '',
-    'lastname': '', 
-    'active': '', 
-    'admin': '', 
+    'lastname': '',
+    'active': '',
+    'admin': '',
     'created_by': '',
 })
 def _pre_create_user_hook(*args, **kwargs):
@@ -173,7 +201,7 b' def _delete_repo_hook(*args, **kwargs):'
     'emails': '',
     'inherit_default_permissions': '',
     'deleted_by': '',
- })
+})
 def _delete_user_hook(*args, **kwargs):
     """
     POST DELETE USER HOOK, this function will be executed after each
@@ -348,6 +376,38 b' def _review_pull_request_hook(*args, **k'
     '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',
+    'pull_request_id': '',
+    'url': '',
+    'title': '',
+    'description': '',
+    'status': '',
+    'comment': '',
+    'created_on': '',
+    'updated_on': '',
+    'commit_ids': '',
+    'review_status': '',
+    'mergeable': '',
+    'source': '',
+    'target': '',
+    'author': '',
+    'reviewers': '',
+})
+def _comment_pull_request_hook(*args, **kwargs):
+    """
+    This hook will be executed after comment is made on a pull request
+    """
+    return HookResponse(0, '')
+
+
+@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',
     'pull_request_id': '',

rhodecode/config/rcextensions/utils.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -18,8 +18,10 b''
 
 import logging
 import os
+import string
 import functools
 import collections
+import urllib
 
 log = logging.getLogger('rhodecode.' + __name__)
 
@@ -186,4 +188,12 b' def aslist(obj, sep=None, strip=True):'
     elif obj is None:
         return []
     else:
-        return [obj]
  No newline at end of file
+        return [obj]
+
+
+class UrlTemplate(string.Template):
+
+    def safe_substitute(self, **kws):
+        # url encode the kw for usage in url
+        kws = {k: urllib.quote(str(v)) for k, v in kws.items()}
+        return super(UrlTemplate, self).safe_substitute(**kws)

rhodecode/config/routing_links.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/config/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -19,7 +19,6 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import os
-import shlex
 import platform
 
 from rhodecode.model import init_model
@@ -91,3 +90,12 b' def set_instance_id(config):'
         prefix = instance_id.lstrip('*')
         _platform_id = platform.uname()[1] or 'instance'
         config['instance_id'] = '%s%s-%s' % (prefix, _platform_id, os.getpid())
+
+
+def get_default_user_id():
+    from rhodecode.model.db import User, Session
+    user_id = Session()\
+        .query(User.user_id)\
+        .filter(User.username == User.DEFAULT_USER)\
+        .scalar()
+    return user_id

rhodecode/events/__init__.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -53,7 +53,7 b' from rhodecode.events.user import ( # p'
 )
 
 from rhodecode.events.repo import (  # pragma: no cover
-    RepoEvent,
+    RepoEvent, RepoCommitCommentEvent,
     RepoPreCreateEvent, RepoCreateEvent,
     RepoPreDeleteEvent, RepoDeleteEvent,
     RepoPrePushEvent,   RepoPushEvent,
@@ -75,4 +75,5 b' from rhodecode.events.pullrequest import'
     PullRequestReviewEvent,
     PullRequestMergeEvent,
     PullRequestCloseEvent,
+    PullRequestCommentEvent,
 )

rhodecode/events/base.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -44,6 +44,9 b' class RhodecodeEvent(object):'
         self._request = request
         self.utc_timestamp = datetime.datetime.utcnow()
 
+    def __repr__(self):
+        return '<%s:(%s)>' % (self.__class__.__name__, self.name)
+
     def get_request(self):
         if self._request:
             return self._request
@@ -116,3 +119,4 b' class RhodeCodeIntegrationEvent(Rhodecod'
     """
     Special subclass for Integration events
     """
+    description = ''

rhodecode/events/interfaces.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/events/pullrequest.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -77,6 +77,7 b' class PullRequestCreateEvent(PullRequest'
     """
     name = 'pullrequest-create'
     display_name = lazy_ugettext('pullrequest created')
+    description = lazy_ugettext('Event triggered after pull request was created')
 
 
 class PullRequestCloseEvent(PullRequestEvent):
@@ -86,6 +87,7 b' class PullRequestCloseEvent(PullRequestE'
     """
     name = 'pullrequest-close'
     display_name = lazy_ugettext('pullrequest closed')
+    description = lazy_ugettext('Event triggered after pull request was closed')
 
 
 class PullRequestUpdateEvent(PullRequestEvent):
@@ -95,6 +97,7 b' class PullRequestUpdateEvent(PullRequest'
     """
     name = 'pullrequest-update'
     display_name = lazy_ugettext('pullrequest commits updated')
+    description = lazy_ugettext('Event triggered after pull requests was updated')
 
 
 class PullRequestReviewEvent(PullRequestEvent):
@@ -104,6 +107,8 b' class PullRequestReviewEvent(PullRequest'
     """
     name = 'pullrequest-review'
     display_name = lazy_ugettext('pullrequest review changed')
+    description = lazy_ugettext('Event triggered after a review status of a '
+                                'pull requests has changed to other.')
 
     def __init__(self, pullrequest, status):
         super(PullRequestReviewEvent, self).__init__(pullrequest)
@@ -117,6 +122,8 b' class PullRequestMergeEvent(PullRequestE'
     """
     name = 'pullrequest-merge'
     display_name = lazy_ugettext('pullrequest merged')
+    description = lazy_ugettext('Event triggered after a successful merge operation '
+                                'was executed on a pull request')
 
 
 class PullRequestCommentEvent(PullRequestEvent):
@@ -126,6 +133,8 b' class PullRequestCommentEvent(PullReques'
     """
     name = 'pullrequest-comment'
     display_name = lazy_ugettext('pullrequest commented')
+    description = lazy_ugettext('Event triggered after a comment was made on a code '
+                                'in the pull request')
 
     def __init__(self, pullrequest, comment):
         super(PullRequestCommentEvent, self).__init__(pullrequest)

rhodecode/events/repo.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -181,6 +181,40 b' class RepoEvent(RhodeCodeIntegrationEven'
         return data
 
 
+class RepoCommitCommentEvent(RepoEvent):
+    """
+    An instance of this class is emitted as an :term:`event` after a comment is made
+    on repository commit.
+    """
+
+    name = 'repo-commit-comment'
+    display_name = lazy_ugettext('repository commit comment')
+    description = lazy_ugettext('Event triggered after a comment was made '
+                                'on commit inside a repository')
+
+    def __init__(self, repo, commit, comment):
+        super(RepoCommitCommentEvent, self).__init__(repo)
+        self.commit = commit
+        self.comment = comment
+
+    def as_dict(self):
+        data = super(RepoCommitCommentEvent, self).as_dict()
+        data['commit'] = {
+            'commit_id': self.commit.raw_id,
+            'commit_message': self.commit.message,
+            'commit_branch': self.commit.branch,
+        }
+
+        data['comment'] = {
+            'comment_id': self.comment.comment_id,
+            'comment_text': self.comment.text,
+            'comment_type': self.comment.comment_type,
+            'comment_f_path': self.comment.f_path,
+            'comment_line_no': self.comment.line_no,
+        }
+        return data
+
+
 class RepoPreCreateEvent(RepoEvent):
     """
     An instance of this class is emitted as an :term:`event` before a repo is
@@ -188,6 +222,7 b' class RepoPreCreateEvent(RepoEvent):'
     """
     name = 'repo-pre-create'
     display_name = lazy_ugettext('repository pre create')
+    description = lazy_ugettext('Event triggered before repository is created')
 
 
 class RepoCreateEvent(RepoEvent):
@@ -197,6 +232,7 b' class RepoCreateEvent(RepoEvent):'
     """
     name = 'repo-create'
     display_name = lazy_ugettext('repository created')
+    description = lazy_ugettext('Event triggered after repository was created')
 
 
 class RepoPreDeleteEvent(RepoEvent):
@@ -206,6 +242,7 b' class RepoPreDeleteEvent(RepoEvent):'
     """
     name = 'repo-pre-delete'
     display_name = lazy_ugettext('repository pre delete')
+    description = lazy_ugettext('Event triggered before a repository is deleted')
 
 
 class RepoDeleteEvent(RepoEvent):
@@ -215,6 +252,7 b' class RepoDeleteEvent(RepoEvent):'
     """
     name = 'repo-delete'
     display_name = lazy_ugettext('repository deleted')
+    description = lazy_ugettext('Event triggered after repository was deleted')
 
 
 class RepoVCSEvent(RepoEvent):
@@ -255,6 +293,7 b' class RepoPrePullEvent(RepoVCSEvent):'
     """
     name = 'repo-pre-pull'
     display_name = lazy_ugettext('repository pre pull')
+    description = lazy_ugettext('Event triggered before repository code is pulled')
 
 
 class RepoPullEvent(RepoVCSEvent):
@@ -264,6 +303,7 b' class RepoPullEvent(RepoVCSEvent):'
     """
     name = 'repo-pull'
     display_name = lazy_ugettext('repository pull')
+    description = lazy_ugettext('Event triggered after repository code was pulled')
 
 
 class RepoPrePushEvent(RepoVCSEvent):
@@ -273,6 +313,8 b' class RepoPrePushEvent(RepoVCSEvent):'
     """
     name = 'repo-pre-push'
     display_name = lazy_ugettext('repository pre push')
+    description = lazy_ugettext('Event triggered before the code is '
+                                'pushed to a repository')
 
 
 class RepoPushEvent(RepoVCSEvent):
@@ -284,6 +326,8 b' class RepoPushEvent(RepoVCSEvent):'
     """
     name = 'repo-push'
     display_name = lazy_ugettext('repository push')
+    description = lazy_ugettext('Event triggered after the code was '
+                                'pushed to a repository')
 
     def __init__(self, repo_name, pushed_commit_ids, extras):
         super(RepoPushEvent, self).__init__(repo_name, extras)

rhodecode/events/repo_group.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -60,6 +60,7 b' class RepoGroupCreateEvent(RepoGroupEven'
     """
     name = 'repo-group-create'
     display_name = lazy_ugettext('repository group created')
+    description = lazy_ugettext('Event triggered after a repository group was created')
 
 
 class RepoGroupDeleteEvent(RepoGroupEvent):
@@ -69,6 +70,7 b' class RepoGroupDeleteEvent(RepoGroupEven'
     """
     name = 'repo-group-delete'
     display_name = lazy_ugettext('repository group deleted')
+    description = lazy_ugettext('Event triggered after a repository group was deleted')
 
 
 class RepoGroupUpdateEvent(RepoGroupEvent):
@@ -78,3 +80,4 b' class RepoGroupUpdateEvent(RepoGroupEven'
     """
     name = 'repo-group-update'
     display_name = lazy_ugettext('repository group update')
+    description = lazy_ugettext('Event triggered after a repository group was updated')

rhodecode/events/user.py

@@ -1,4 +1,4 b''
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/forms/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/registry.py

@@ -1,5 +1,5 b''
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/routes.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/schema.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/tests/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/tests/test_integrations.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/types/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/integrations/types/base.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -125,6 +125,19 b' class IntegrationTypeBase(object):'
         """
         return colander.Schema()
 
+    def event_enabled(self, event):
+        """
+        Checks if submitted event is enabled based on the plugin settings
+        :param event:
+        :return: bool
+        """
+        allowed_events = self.settings['events']
+        if event.name not in allowed_events:
+            log.debug('event ignored: %r event %s not in allowed set of events %s',
+                      event, event.name, allowed_events)
+            return False
+        return True
+
 
 class EEIntegration(IntegrationTypeBase):
     description = 'Integration available in RhodeCode EE edition.'
@@ -139,30 +152,57 b' class EEIntegration(IntegrationTypeBase)'
 # Helpers #
 # updating this required to update the `common_vars` as well.
 WEBHOOK_URL_VARS = [
-    ('event_name', 'Unique name of the event type, e.g pullrequest-update'),
-    ('repo_name', 'Full name of the repository'),
-    ('repo_type', 'VCS type of repository'),
-    ('repo_id', 'Unique id of repository'),
-    ('repo_url', 'Repository url'),
+    # GENERAL
+    ('General', [
+        ('event_name', 'Unique name of the event type, e.g pullrequest-update'),
+        ('repo_name', 'Full name of the repository'),
+        ('repo_type', 'VCS type of repository'),
+        ('repo_id', 'Unique id of repository'),
+        ('repo_url', 'Repository url'),
+        ]
+    ),
     # extra repo fields
-    ('extra:<extra_key_name>', 'Extra repo variables, read from its settings.'),
-
+    ('Repository', [
+        ('extra:<extra_key_name>', 'Extra repo variables, read from its settings.'),
+        ]
+    ),
     # special attrs below that we handle, using multi-call
-    ('branch', 'Name of each branch submitted, if any.'),
-    ('branch_head', 'Head ID of pushed branch (full sha of last commit), if any.'),
-    ('commit_id', 'ID (full sha) of each commit submitted, if any.'),
-
+    ('Commit push - Multicalls', [
+        ('branch', 'Name of each branch submitted, if any.'),
+        ('branch_head', 'Head ID of pushed branch (full sha of last commit), if any.'),
+        ('commit_id', 'ID (full sha) of each commit submitted, if any.'),
+        ]
+    ),
     # pr events vars
-    ('pull_request_id', 'Unique ID of the pull request.'),
-    ('pull_request_title', 'Title of the pull request.'),
-    ('pull_request_url', 'Pull request url.'),
-    ('pull_request_shadow_url', 'Pull request shadow repo clone url.'),
-    ('pull_request_commits_uid', 'Calculated UID of all commits inside the PR. '
-                                 'Changes after PR update'),
+    ('Pull request', [
+        ('pull_request_id', 'Unique ID of the pull request.'),
+        ('pull_request_title', 'Title of the pull request.'),
+        ('pull_request_url', 'Pull request url.'),
+        ('pull_request_shadow_url', 'Pull request shadow repo clone url.'),
+        ('pull_request_commits_uid', 'Calculated UID of all commits inside the PR. '
+                                     'Changes after PR update'),
+        ]
+    ),
+    # commit comment event vars
+    ('Commit comment', [
+        ('commit_comment_id', 'Unique ID of the comment made on a commit.'),
+        ('commit_comment_text', 'Text of commit comment.'),
+        ('commit_comment_type', 'Type of comment, e.g note/todo.'),
 
+        ('commit_comment_f_path', 'Optionally path of file for inline comments.'),
+        ('commit_comment_line_no', 'Line number of the file: eg o10, or n200'),
+
+        ('commit_comment_commit_id', 'Commit id that comment was left at.'),
+        ('commit_comment_commit_branch', 'Commit branch that comment was left at'),
+        ('commit_comment_commit_message', 'Commit message that comment was left at'),
+        ]
+    ),
     # user who triggers the call
-    ('username', 'User who triggered the call.'),
-    ('user_id', 'User id who triggered the call.'),
+    ('Caller', [
+        ('username', 'User who triggered the call.'),
+        ('user_id', 'User id who triggered the call.'),
+        ]
+    ),
 ]
 
 # common vars for url template used for CI plugins. Shared with webhook
@@ -271,6 +311,26 b' class WebhookDataHandler(CommitParsingDa'
 
         return url_calls
 
+    def repo_commit_comment_handler(self, event, data):
+        url = self.get_base_parsed_template(data)
+        log.debug('register %s call(%s) to url %s', self.name, event, url)
+        comment_vars = [
+            ('commit_comment_id', data['comment']['comment_id']),
+            ('commit_comment_text', data['comment']['comment_text']),
+            ('commit_comment_type', data['comment']['comment_type']),
+
+            ('commit_comment_f_path', data['comment']['comment_f_path']),
+            ('commit_comment_line_no', data['comment']['comment_line_no']),
+
+            ('commit_comment_commit_id', data['commit']['commit_id']),
+            ('commit_comment_commit_branch', data['commit']['commit_branch']),
+            ('commit_comment_commit_message', data['commit']['commit_message']),
+        ]
+        for k, v in comment_vars:
+            url = UrlTmpl(url).safe_substitute(**{k: v})
+
+        return [(url, self.headers, data)]
+
     def repo_create_event_handler(self, event, data):
         url = self.get_base_parsed_template(data)
         log.debug('register %s call(%s) to url %s', self.name, event, url)
@@ -298,12 +358,13 b' class WebhookDataHandler(CommitParsingDa'
             return self.repo_push_event_handler(event, data)
         elif isinstance(event, events.RepoCreateEvent):
             return self.repo_create_event_handler(event, data)
+        elif isinstance(event, events.RepoCommitCommentEvent):
+            return self.repo_commit_comment_handler(event, data)
         elif isinstance(event, events.PullRequestEvent):
             return self.pull_request_event_handler(event, data)
         else:
             raise ValueError(
-                'event type `%s` not in supported list: %s' % (
-                    event.__class__, events))
+                'event type `{}` has no handler defined'.format(event.__class__))
 
 
 def get_auth(settings):
@@ -320,9 +381,13 b' def get_web_token(settings):'
 
 
 def get_url_vars(url_vars):
-    return '\n'.join(
-        '{} - {}'.format('${' + key + '}', explanation)
-        for key, explanation in url_vars)
+    items = []
+
+    for section, section_items in url_vars:
+        items.append('\n*{}*'.format(section))
+        for key, explanation in section_items:
+            items.append('  {} - {}'.format('${' + key + '}', explanation))
+    return '\n'.join(items)
 
 
 def render_with_traceback(template, *args, **kwargs):

rhodecode/integrations/types/email.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -19,13 +19,14 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 from __future__ import unicode_literals
-import deform
 import logging
+
 import colander
-
+import deform.widget
 from mako.template import Template
 
 from rhodecode import events
+from rhodecode.model.validation_schema.widgets import CheckboxChoiceWidgetDesc
 from rhodecode.translation import _
 from rhodecode.lib.celerylib import run_task
 from rhodecode.lib.celerylib import tasks
@@ -174,6 +175,10 b' class EmailIntegrationType(IntegrationTy'
     display_name = _('Email')
     description = _('Send repo push summaries to a list of recipients via email')
 
+    valid_events = [
+        events.RepoPushEvent
+    ]
+
     @classmethod
     def icon(cls):
         return '''
@@ -240,59 +245,86 b' class EmailIntegrationType(IntegrationTy'
 
     def settings_schema(self):
         schema = EmailSettingsSchema()
+        schema.add(colander.SchemaNode(
+            colander.Set(),
+            widget=CheckboxChoiceWidgetDesc(
+                values=sorted(
+                    [(e.name, e.display_name, e.description) for e in self.valid_events]
+                ),
+            ),
+            description="List of events activated for this integration",
+            name='events'
+        ))
         return schema
 
     def send_event(self, event):
-        data = event.as_dict()
-        log.debug('got event: %r', event)
+        log.debug('handling event %s with integration %s', event.name, self)
+
+        if event.__class__ not in self.valid_events:
+            log.debug('event %r not present in valid event list (%s)', event, self.valid_events)
+            return
+
+        if not self.event_enabled(event):
+            # NOTE(marcink): for legacy reasons we're skipping this check...
+            # since the email event haven't had any settings...
+            pass
 
+        handler = EmailEventHandler(self.settings)
+        handler(event, event_data=event.as_dict())
+
+
+class EmailEventHandler(object):
+    def __init__(self, integration_settings):
+        self.integration_settings = integration_settings
+
+    def __call__(self, event, event_data):
         if isinstance(event, events.RepoPushEvent):
-            repo_push_handler(data, self.settings)
+            self.repo_push_handler(event, event_data)
         else:
             log.debug('ignoring event: %r', event)
 
-
-def repo_push_handler(data, settings):
-    commit_num = len(data['push']['commits'])
-    server_url = data['server_url']
+    def repo_push_handler(self, event, data):
+        commit_num = len(data['push']['commits'])
+        server_url = data['server_url']
 
-    if commit_num == 1:
-        if data['push']['branches']:
-            _subject = '[{repo_name}] {author} pushed {commit_num} commit on branches: {branches}'
-        else:
-            _subject = '[{repo_name}] {author} pushed {commit_num} commit'
-        subject = _subject.format(
-            author=data['actor']['username'],
-            repo_name=data['repo']['repo_name'],
-            commit_num=commit_num,
-            branches=', '.join(
-                branch['name'] for branch in data['push']['branches'])
-        )
-    else:
-        if data['push']['branches']:
-            _subject = '[{repo_name}] {author} pushed {commit_num} commits on branches: {branches}'
+        if commit_num == 1:
+            if data['push']['branches']:
+                _subject = '[{repo_name}] {author} pushed {commit_num} commit on branches: {branches}'
+            else:
+                _subject = '[{repo_name}] {author} pushed {commit_num} commit'
+            subject = _subject.format(
+                author=data['actor']['username'],
+                repo_name=data['repo']['repo_name'],
+                commit_num=commit_num,
+                branches=', '.join(
+                    branch['name'] for branch in data['push']['branches'])
+            )
         else:
-            _subject = '[{repo_name}] {author} pushed {commit_num} commits'
-        subject = _subject.format(
-            author=data['actor']['username'],
-            repo_name=data['repo']['repo_name'],
-            commit_num=commit_num,
-            branches=', '.join(
-                branch['name'] for branch in data['push']['branches']))
+            if data['push']['branches']:
+                _subject = '[{repo_name}] {author} pushed {commit_num} commits on branches: {branches}'
+            else:
+                _subject = '[{repo_name}] {author} pushed {commit_num} commits'
+            subject = _subject.format(
+                author=data['actor']['username'],
+                repo_name=data['repo']['repo_name'],
+                commit_num=commit_num,
+                branches=', '.join(
+                    branch['name'] for branch in data['push']['branches']))
 
-    email_body_plaintext = render_with_traceback(
-        REPO_PUSH_TEMPLATE_PLAINTEXT,
-        data=data,
-        subject=subject,
-        instance_url=server_url)
+        email_body_plaintext = render_with_traceback(
+            REPO_PUSH_TEMPLATE_PLAINTEXT,
+            data=data,
+            subject=subject,
+            instance_url=server_url)
 
-    email_body_html = render_with_traceback(
-        REPO_PUSH_TEMPLATE_HTML,
-        data=data,
-        subject=subject,
-        instance_url=server_url)
+        email_body_html = render_with_traceback(
+            REPO_PUSH_TEMPLATE_HTML,
+            data=data,
+            subject=subject,
+            instance_url=server_url)
 
-    for email_address in settings['recipients']:
-        run_task(
-            tasks.send_email, email_address, subject,
-            email_body_plaintext, email_body_html)
+        recipients = self.integration_settings['recipients']
+        for email_address in recipients:
+            run_task(
+                tasks.send_email, email_address, subject,
+                email_body_plaintext, email_body_html)

rhodecode/integrations/types/hipchat.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -26,6 +26,7 b' import colander'
 import textwrap
 from mako.template import Template
 from rhodecode import events
+from rhodecode.model.validation_schema.widgets import CheckboxChoiceWidgetDesc
 from rhodecode.translation import _
 from rhodecode.lib import helpers as h
 from rhodecode.lib.celerylib import run_task, async_task, RequestContextTask
@@ -119,13 +120,10 b' class HipchatIntegrationType(Integration'
 
     def send_event(self, event):
         if event.__class__ not in self.valid_events:
-            log.debug('event not valid: %r', event)
+            log.debug('event %r not present in valid event list (%s)', event, self.valid_events)
             return
 
-        allowed_events = self.settings['events']
-        if event.name not in allowed_events:
-            log.debug('event ignored: %r event %s not in allowed events %s',
-                      event, event.name, allowed_events)
+        if not self.event_enabled(event):
             return
 
         data = event.as_dict()
@@ -133,8 +131,6 b' class HipchatIntegrationType(Integration'
         text = '<b>%s<b> caused a <b>%s</b> event' % (
             data['actor']['username'], event.name)
 
-        log.debug('handling hipchat event for %s', event.name)
-
         if isinstance(event, events.PullRequestCommentEvent):
             text = self.format_pull_request_comment_event(event, data)
         elif isinstance(event, events.PullRequestReviewEvent):
@@ -154,12 +150,12 b' class HipchatIntegrationType(Integration'
         schema = HipchatSettingsSchema()
         schema.add(colander.SchemaNode(
             colander.Set(),
-            widget=deform.widget.CheckboxChoiceWidget(
+            widget=CheckboxChoiceWidgetDesc(
                 values=sorted(
-                    [(e.name, e.display_name) for e in self.valid_events]
-                )
+                    [(e.name, e.display_name, e.description) for e in self.valid_events]
+                ),
             ),
-            description="Events activated for this integration",
+            description="List of events activated for this integration",
             name='events'
         ))
 

rhodecode/integrations/types/slack.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -30,6 +30,7 b' import colander'
 from mako.template import Template
 
 from rhodecode import events
+from rhodecode.model.validation_schema.widgets import CheckboxChoiceWidgetDesc
 from rhodecode.translation import _
 from rhodecode.lib import helpers as h
 from rhodecode.lib.celerylib import run_task, async_task, RequestContextTask
@@ -134,14 +135,13 b' class SlackIntegrationType(IntegrationTy'
     ]
 
     def send_event(self, event):
+        log.debug('handling event %s with integration %s', event.name, self)
+
         if event.__class__ not in self.valid_events:
-            log.debug('event not valid: %r', event)
+            log.debug('event %r not present in valid event list (%s)', event, self.valid_events)
             return
 
-        allowed_events = self.settings['events']
-        if event.name not in allowed_events:
-            log.debug('event ignored: %r event %s not in allowed events %s',
-                      event, event.name, allowed_events)
+        if not self.event_enabled(event):
             return
 
         data = event.as_dict()
@@ -154,8 +154,6 b' class SlackIntegrationType(IntegrationTy'
         fields = None
         overrides = None
 
-        log.debug('handling slack event for %s', event.name)
-
         if isinstance(event, events.PullRequestCommentEvent):
             (title, text, fields, overrides) \
                 = self.format_pull_request_comment_event(event, data)
@@ -176,12 +174,12 b' class SlackIntegrationType(IntegrationTy'
         schema = SlackSettingsSchema()
         schema.add(colander.SchemaNode(
             colander.Set(),
-            widget=deform.widget.CheckboxChoiceWidget(
+            widget=CheckboxChoiceWidgetDesc(
                 values=sorted(
-                    [(e.name, e.display_name) for e in self.valid_events]
-                )
+                    [(e.name, e.display_name, e.description) for e in self.valid_events]
+                ),
             ),
-            description="Events activated for this integration",
+            description="List of events activated for this integration",
             name='events'
         ))
 

rhodecode/integrations/types/webhook.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -20,13 +20,14 b''
 
 from __future__ import unicode_literals
 
-import deform
 import deform.widget
 import logging
 import colander
 
 import rhodecode
 from rhodecode import events
+from rhodecode.lib.colander_utils import strip_whitespace
+from rhodecode.model.validation_schema.widgets import CheckboxChoiceWidgetDesc
 from rhodecode.translation import _
 from rhodecode.integrations.types.base import (
     IntegrationTypeBase, get_auth, get_web_token, get_url_vars,
@@ -53,11 +54,12 b' class WebhookSettingsSchema(colander.Sch'
               'objects in data in such cases.'),
         missing=colander.required,
         required=True,
+        preparer=strip_whitespace,
         validator=colander.url,
         widget=widgets.CodeMirrorWidget(
             help_block_collapsable_name='Show url variables',
             help_block_collapsable=(
-                'E.g http://my-serv/trigger_job/${{event_name}}'
+                'E.g http://my-serv.com/trigger_job/${{event_name}}'
                 '?PR_ID=${{pull_request_id}}'
                 '\nFull list of vars:\n{}'.format(URL_VARS)),
             codemirror_mode='text',
@@ -146,34 +148,31 b' class WebhookIntegrationType(Integration'
         events.PullRequestCreateEvent,
         events.RepoPushEvent,
         events.RepoCreateEvent,
+        events.RepoCommitCommentEvent,
     ]
 
     def settings_schema(self):
         schema = WebhookSettingsSchema()
         schema.add(colander.SchemaNode(
             colander.Set(),
-            widget=deform.widget.CheckboxChoiceWidget(
+            widget=CheckboxChoiceWidgetDesc(
                 values=sorted(
-                    [(e.name, e.display_name) for e in self.valid_events]
-                )
+                    [(e.name, e.display_name, e.description) for e in self.valid_events]
+                ),
             ),
-            description="Events activated for this integration",
+            description="List of events activated for this integration",
             name='events'
         ))
         return schema
 
     def send_event(self, event):
-        log.debug(
-            'handling event %s with Webhook integration %s', event.name, self)
+        log.debug('handling event %s with integration %s', event.name, self)
 
         if event.__class__ not in self.valid_events:
-            log.debug('event not valid: %r', event)
+            log.debug('event %r not present in valid event list (%s)', event, self.valid_events)
             return
 
-        allowed_events = self.settings['events']
-        if event.name not in allowed_events:
-            log.debug('event ignored: %r event %s not in allowed events %s',
-                      event, event.name, allowed_events)
+        if not self.event_enabled(event):
             return
 
         data = event.as_dict()

rhodecode/integrations/views.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/_vendor/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/action_parser.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/audit_logger.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2017-2019 RhodeCode GmbH
+# Copyright (C) 2017-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/auth.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -23,6 +23,8 b' authentication and permission libraries'
 """
 
 import os
+
+import colander
 import time
 import collections
 import fnmatch
@@ -45,15 +47,14 b' from rhodecode.model import meta'
 from rhodecode.model.meta import Session
 from rhodecode.model.user import UserModel
 from rhodecode.model.db import (
-    User, Repository, Permission, UserToPerm, UserGroupToPerm, UserGroupMember,
-    UserIpMap, UserApiKeys, RepoGroup, UserGroup)
+    false, User, Repository, Permission, UserToPerm, UserGroupToPerm, UserGroupMember,
+    UserIpMap, UserApiKeys, RepoGroup, UserGroup, UserNotice)
 from rhodecode.lib import rc_cache
 from rhodecode.lib.utils2 import safe_unicode, aslist, safe_str, md5, safe_int, sha1
 from rhodecode.lib.utils import (
     get_repo_slug, get_repo_group_slug, get_user_group_slug)
 from rhodecode.lib.caching_query import FromCache
 
-
 if rhodecode.is_unix:
     import bcrypt
 
@@ -1312,7 +1313,10 b' class AuthUser(object):'
         if not perms:
             perms = AuthUser.repo_read_perms
 
-        def _cached_repo_acl(user_id, perm_def, _name_filter):
+        if not isinstance(perms, list):
+            raise ValueError('perms parameter must be a list got {} instead'.format(perms))
+
+        def _cached_repo_acl(perm_def, _name_filter):
             qry = Repository.query()
             if _name_filter:
                 ilike_expression = u'%{}%'.format(safe_unicode(_name_filter))
@@ -1322,7 +1326,21 b' class AuthUser(object):'
             return [x.repo_id for x in
                     RepoList(qry, perm_set=perm_def, extra_kwargs={'user': self})]
 
-        return _cached_repo_acl(self.user_id, perms, name_filter)
+        log.debug('Computing REPO ACL IDS user %s', self)
+
+        cache_namespace_uid = 'cache_user_repo_acl_ids.{}'.format(self.user_id)
+        region = rc_cache.get_or_create_region('cache_perms', cache_namespace_uid)
+
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid, condition=cache)
+        def compute_repo_acl_ids(cache_ver, user_id, perm_def, _name_filter):
+            return _cached_repo_acl(perm_def, _name_filter)
+
+        start = time.time()
+        result = compute_repo_acl_ids('v1', self.user_id, perms, name_filter)
+        total = time.time() - start
+        log.debug('REPO ACL IDS for user %s computed in %.4fs', self, total)
+
+        return result
 
     def repo_group_acl_ids_from_stack(self, perms=None, prefix_filter=None, cache=False):
         if not perms:
@@ -1346,7 +1364,10 b' class AuthUser(object):'
         if not perms:
             perms = AuthUser.repo_group_read_perms
 
-        def _cached_repo_group_acl(user_id, perm_def, _name_filter):
+        if not isinstance(perms, list):
+            raise ValueError('perms parameter must be a list got {} instead'.format(perms))
+
+        def _cached_repo_group_acl(perm_def, _name_filter):
             qry = RepoGroup.query()
             if _name_filter:
                 ilike_expression = u'%{}%'.format(safe_unicode(_name_filter))
@@ -1356,7 +1377,21 b' class AuthUser(object):'
             return [x.group_id for x in
                     RepoGroupList(qry, perm_set=perm_def, extra_kwargs={'user': self})]
 
-        return _cached_repo_group_acl(self.user_id, perms, name_filter)
+        log.debug('Computing REPO GROUP ACL IDS user %s', self)
+
+        cache_namespace_uid = 'cache_user_repo_group_acl_ids.{}'.format(self.user_id)
+        region = rc_cache.get_or_create_region('cache_perms', cache_namespace_uid)
+
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid, condition=cache)
+        def compute_repo_group_acl_ids(cache_ver, user_id, perm_def, _name_filter):
+            return _cached_repo_group_acl(perm_def, _name_filter)
+
+        start = time.time()
+        result = compute_repo_group_acl_ids('v1', self.user_id, perms, name_filter)
+        total = time.time() - start
+        log.debug('REPO GROUP ACL IDS for user %s computed in %.4fs', self, total)
+
+        return result
 
     def user_group_acl_ids_from_stack(self, perms=None, cache=False):
         if not perms:
@@ -1378,17 +1413,34 b' class AuthUser(object):'
         if not perms:
             perms = AuthUser.user_group_read_perms
 
-        def _cached_user_group_acl(user_id, perm_def, name_filter):
+        if not isinstance(perms, list):
+            raise ValueError('perms parameter must be a list got {} instead'.format(perms))
+
+        def _cached_user_group_acl(perm_def, _name_filter):
             qry = UserGroup.query()
-            if name_filter:
-                ilike_expression = u'%{}%'.format(safe_unicode(name_filter))
+            if _name_filter:
+                ilike_expression = u'%{}%'.format(safe_unicode(_name_filter))
                 qry = qry.filter(
                     UserGroup.users_group_name.ilike(ilike_expression))
 
             return [x.users_group_id for x in
                     UserGroupList(qry, perm_set=perm_def, extra_kwargs={'user': self})]
 
-        return _cached_user_group_acl(self.user_id, perms, name_filter)
+        log.debug('Computing USER GROUP ACL IDS user %s', self)
+
+        cache_namespace_uid = 'cache_user_user_group_acl_ids.{}'.format(self.user_id)
+        region = rc_cache.get_or_create_region('cache_perms', cache_namespace_uid)
+
+        @region.conditional_cache_on_arguments(namespace=cache_namespace_uid, condition=cache)
+        def compute_user_group_acl_ids(cache_ver, user_id, perm_def, _name_filter):
+            return _cached_user_group_acl(perm_def, _name_filter)
+
+        start = time.time()
+        result = compute_user_group_acl_ids('v1', self.user_id, perms, name_filter)
+        total = time.time() - start
+        log.debug('USER GROUP ACL IDS for user %s computed in %.4fs', self, total)
+
+        return result
 
     @property
     def ip_allowed(self):
@@ -1402,6 +1454,7 b' class AuthUser(object):'
         inherit = self.inherit_default_permissions
         return AuthUser.check_ip_allowed(self.user_id, self.ip_addr,
                                          inherit_from_default=inherit)
+
     @property
     def personal_repo_group(self):
         return RepoGroup.get_user_personal_repo_group(self.user_id)
@@ -1455,9 +1508,40 b' class AuthUser(object):'
 
         return rule, default_perm
 
+    def get_notice_messages(self):
+
+        notice_level = 'notice-error'
+        notice_messages = []
+        if self.is_default:
+            return [], notice_level
+
+        notices = UserNotice.query()\
+            .filter(UserNotice.user_id == self.user_id)\
+            .filter(UserNotice.notice_read == false())\
+            .all()
+
+        try:
+            for entry in notices:
+
+                msg = {
+                    'msg_id': entry.user_notice_id,
+                    'level': entry.notification_level,
+                    'subject': entry.notice_subject,
+                    'body': entry.notice_body,
+                }
+                notice_messages.append(msg)
+
+            log.debug('Got user %s %s messages', self, len(notice_messages))
+
+            levels = [x['level'] for x in notice_messages]
+            notice_level = 'notice-error' if 'error' in levels else 'notice-warning'
+        except Exception:
+            pass
+
+        return notice_messages, notice_level
+
     def __repr__(self):
-        return "<AuthUser('id:%s[%s] ip:%s auth:%s')>"\
-            % (self.user_id, self.username, self.ip_addr, self.is_authenticated)
+        return self.repr_user(self.user_id, self.username, self.ip_addr, self.is_authenticated)
 
     def set_authenticated(self, authenticated=True):
         if self.user_id != self.anonymous_user.user_id:
@@ -1472,6 +1556,11 b' class AuthUser(object):'
         }
 
     @classmethod
+    def repr_user(cls, user_id=0, username='ANONYMOUS', ip='0.0.0.0', is_authenticated=False):
+        tmpl = "<AuthUser('id:{}[{}] ip:{} auth:{}')>"
+        return tmpl.format(user_id, username, ip, is_authenticated)
+
+    @classmethod
     def from_cookie_store(cls, cookie_store):
         """
         Creates AuthUser from a cookie store

rhodecode/lib/base.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -283,7 +283,7 b' def get_current_lang(request):'
     return getattr(request, '_LOCALE_', request.locale_name)
 
 
-def attach_context_attributes(context, request, user_id=None):
+def attach_context_attributes(context, request, user_id=None, is_api=None):
     """
     Attach variables into template context called `c`.
     """
@@ -379,7 +379,8 b' def attach_context_attributes(context, r'
         "sideside": "sideside"
     }.get(request.GET.get('diffmode'))
 
-    is_api = hasattr(request, 'rpc_user')
+    if is_api is not None:
+        is_api = hasattr(request, 'rpc_user')
     session_attrs = {
         # defaults
         "clone_url_format": "http",
@@ -436,7 +437,7 b' def attach_context_attributes(context, r'
 
     context.csrf_token = csrf_token
     context.backends = rhodecode.BACKENDS.keys()
-    context.backends.sort()
+
     unread_count = 0
     user_bookmark_list = []
     if user_id:

rhodecode/lib/caching_query.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/celerylib/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/celerylib/loader.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/celerylib/scheduler.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/celerylib/tasks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -49,6 +49,7 b' def send_email(recipients, subject, body'
     :param subject: subject of the mail
     :param body: body of the mail
     :param html_body: html version of body
+    :param email_config: specify custom configuration for mailer
     """
     log = get_logger(send_email)
 

rhodecode/lib/celerylib/utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/channelstream.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/codeblocks.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/colander_utils.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2016-2019 RhodeCode GmbH
+# Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/colored_formatter.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/compat.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019 RhodeCode GmbH
+# Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/datelib.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/db_manage.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2012-2019 RhodeCode GmbH
+# Copyright (C) 2012-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/migrate/changeset/__init__.py

@@ -12,10 +12,11 b' from sqlalchemy import __version__ as _s'
 
 warnings.simplefilter('always', DeprecationWarning)
 
-_sa_version = tuple(int(re.match("\d+", x).group(0))
-                    for x in _sa_version.split("."))
+_sa_version = tuple(int(re.match("\d+", x).group(0)) for x in _sa_version.split("."))
 SQLA_07 = _sa_version >= (0, 7)
 SQLA_08 = _sa_version >= (0, 8)
+SQLA_09 = _sa_version >= (0, 9)
+SQLA_10 = _sa_version >= (1, 0)
 
 del re
 del _sa_version
@@ -23,8 +24,8 b' del _sa_version'
 from rhodecode.lib.dbmigrate.migrate.changeset.schema import *
 from rhodecode.lib.dbmigrate.migrate.changeset.constraint import *
 
-sqlalchemy.schema.Table.__bases__ += (ChangesetTable,)
-sqlalchemy.schema.Column.__bases__ += (ChangesetColumn,)
-sqlalchemy.schema.Index.__bases__ += (ChangesetIndex,)
+sqlalchemy.schema.Table.__bases__ += (ChangesetTable, )
+sqlalchemy.schema.Column.__bases__ += (ChangesetColumn, )
+sqlalchemy.schema.Index.__bases__ += (ChangesetIndex, )
 
-sqlalchemy.schema.DefaultClause.__bases__ += (ChangesetDefaultClause,)
+sqlalchemy.schema.DefaultClause.__bases__ += (ChangesetDefaultClause, )

rhodecode/lib/dbmigrate/migrate/changeset/ansisql.py

@@ -97,7 +97,6 b' class ANSIColumnGenerator(AlterTableVisi'
 
         table = self.start_alter_table(column)
         self.append("ADD ")
-
         self.append(self.get_column_specification(column))
 
         for cons in column.constraints:

rhodecode/lib/dbmigrate/migrate/changeset/constraint.py

@@ -111,7 +111,7 b' class ForeignKeyConstraint(ConstraintCha'
         refcolnames, reftable = self._normalize_columns(refcolumns,
                                                         table_name=True)
         super(ForeignKeyConstraint, self).__init__(
-            colnames, refcolnames, *args,**kwargs
+            colnames, refcolnames, *args, **kwargs
         )
         if table is not None:
             self._set_parent(table)

rhodecode/lib/dbmigrate/migrate/changeset/databases/sqlite.py

@@ -3,16 +3,20 b''
 
    .. _`SQLite`: http://www.sqlite.org/
 """
-from UserDict import DictMixin
+try:  # Python 3
+    from collections.abc import MutableMapping as DictMixin
+except ImportError:  # Python 2
+    from UserDict import DictMixin
 from copy import copy
 import re
 
 from sqlalchemy.databases import sqlite as sa_base
+from sqlalchemy.schema import ForeignKeyConstraint
 from sqlalchemy.schema import UniqueConstraint
 
 from rhodecode.lib.dbmigrate.migrate import exceptions
 from rhodecode.lib.dbmigrate.migrate.changeset import ansisql
-
+import sqlite3
 
 SQLiteSchemaGenerator = sa_base.SQLiteDDLCompiler
 
@@ -73,10 +77,16 b' class SQLiteHelper(SQLiteCommon):'
             cons for cons in table.constraints
             if omit_uniques is None or cons.name not in omit_uniques
         ])
+        tup = sqlite3.sqlite_version_info
+        if tup[0] > 3 or (tup[0] == 3 and tup[1] >= 26):
+            self.append('PRAGMA legacy_alter_table = ON')
+            self.execute()
 
         self.append('ALTER TABLE %s RENAME TO migration_tmp' % table_name)
         self.execute()
-
+        if tup[0] > 3 or (tup[0] == 3 and tup[1] >= 26):
+            self.append('PRAGMA legacy_alter_table = OFF')
+            self.execute()
         insertion_string = self._modify_table(table, column, delta)
 
         table.create(bind=self.connection)

rhodecode/lib/dbmigrate/migrate/changeset/schema.py

@@ -1,10 +1,13 b''
 """
    Schema module providing common schema operations.
 """
+import abc
+try:  # Python 3
+    from collections.abc import MutableMapping as DictMixin
+except ImportError:  # Python 2
+    from UserDict import DictMixin
 import warnings
 
-from UserDict import DictMixin
-
 import sqlalchemy
 
 from sqlalchemy.schema import ForeignKeyConstraint

rhodecode/lib/dbmigrate/migrate/changeset/util.py

@@ -1,6 +1,17 b''
 """
 Safe quoting method
 """
+from rhodecode.lib.dbmigrate.migrate.changeset import SQLA_10
+
+
+def fk_column_names(constraint):
+    if SQLA_10:
+        return [
+            constraint.columns[key].name for key in constraint.column_keys]
+    else:
+        return [
+            element.parent.name for element in constraint.elements]
+
 
 def safe_quote(obj):
     # this is the SQLA 0.9 approach

rhodecode/lib/dbmigrate/migrate/exceptions.py

@@ -27,6 +27,10 b' class InvalidVersionError(ControlledSche'
     """Invalid version number."""
 
 
+class VersionNotFoundError(KeyError):
+    """Specified version is not present."""
+
+
 class DatabaseNotControlledError(ControlledSchemaError):
     """Database should be under version control, but it's not."""
 

rhodecode/lib/dbmigrate/schema/__init__.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_1_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_2_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_3_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_4_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_5_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_5_2.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_6_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_7_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_1_8_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_0_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_0_1.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_0_2.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_1_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_2_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_2_3.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3

rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2010-2019 RhodeCode GmbH
+# Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3