merge with default

docs/release-notes/release-notes-4.16.1.rst

@@ -0,0 +1,47 b''
+|RCE| 4.16.1 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2019-03-07
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+- Docs: added missing reference for the user bookmarks feature.
+
+
+Security
+^^^^^^^^
+
+- Comments: prevent from allowing to resolve TODO comments across projects. In certain
+  conditions users could resolve TODOs not belonging to the same project.
+
+
+Performance
+^^^^^^^^^^^
+
+
+
+Fixes
+^^^^^
+
+- Downloads: fixed archive links from file tree view.
+- Markdown: fixed sanitization of checkbox extensions that removed "checked" attribute.
+- Upgrade: fixed upgrades from older versions of RhodeCode.
+- Pull Requests: handle non-ascii branches from short branch selector via URL.
+- Hooks: fixed again unicode problems with new pull request link generator.
+
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Scheduled release addressing problems in 4.16.X releases.

.hgtags

@@ -50,3 +50,4 b' 4b34ce0d2c3c10510626b3b65044939bb7a2cddf'
 14502561d22e6b70613674cd675ae9a604b7989f v4.15.1
 4aaa40b605b01af78a9f6882eca561c54b525ef0 v4.15.2
 797744642eca86640ed20bef2cd77445780abaec v4.16.0
+6c3452c7c25ed35ff269690929e11960ed6ad7d3 v4.16.1

Makefile

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

configs/development.ini

@@ -379,6 +379,10 b' rc_cache.cache_repo_longterm.max_size = '
 beaker.session.type = file
 beaker.session.data_dir = %(here)s/data/sessions
 
+## redis sessions
+#beaker.session.type = ext:redis
+#beaker.session.url = redis://127.0.0.1:6379/2
+
 ## db based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
 #beaker.session.table_name = db_session

configs/production.ini

@@ -354,6 +354,10 b' rc_cache.cache_repo_longterm.max_size = '
 beaker.session.type = file
 beaker.session.data_dir = %(here)s/data/sessions
 
+## redis sessions
+#beaker.session.type = ext:redis
+#beaker.session.url = redis://127.0.0.1:6379/2
+
 ## db based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
 #beaker.session.table_name = db_session

docs/admin/admin-tricks.rst

@@ -239,3 +239,26 b' following URL: ``{instance-URL}/_admin/p'
 
 .. _Markdown: http://daringfireball.net/projects/markdown/
 .. _reStructured Text: http://docutils.sourceforge.net/docs/index.html
+
+
+Unarchiving a repository
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Archive operation for the repository is similar as delete. Archive keeps the data for future references
+but makes the repository read-only. After archiving the repository it shouldn't be modified in any way.
+This is why repository settings are disabled for an archived repository.
+
+If there's a need for unarchiving a repository for some reasons, the interactive
+ishell interface should be used.
+
+.. code-block:: bash
+
+  # Open iShell from the terminal
+  $ rccontrol ishell enterprise-1/community-1
+
+.. code-block:: python
+
+  # Set repository as un-archived
+  In [1]: repo = Repository.get_by_repo_name('SOME_REPO_NAME')
+  In [2]: repo.archived = False
+  In [3]: Session().add(repo);Session().commit()

docs/admin/apache-conf-example.rst

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

docs/release-notes/release-notes.rst

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

pkgs/node-packages.nix

@@ -166,13 +166,13 b' let'
         sha512 = "dgOe12GyCF1VZBLUQqnzGWlf3xb255FajNCVB1VFj/AtskYtoamnafa7m3a+1vs+C8qbg4Benn5KwgxVDSW4cg==";
       };
     };
-    "@polymer/paper-spinner-3.0.1" = {
+    "@polymer/paper-spinner-3.0.2" = {
       name = "_at_polymer_slash_paper-spinner";
       packageName = "@polymer/paper-spinner";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@polymer/paper-spinner/-/paper-spinner-3.0.1.tgz";
-        sha512 = "MYIU6qWZnhZ5yNFOBzROPgBteGfxKEnDZ6bCgjrvUtJkBuQEz0MQZzSE/zmZc0oaJ9u5QK5xAFuYdudsGv7+sQ==";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@polymer/paper-spinner/-/paper-spinner-3.0.2.tgz";
+        sha512 = "XUzu8/4NH+pnNZUTI2MxtOKFAr0EOsW7eGhTg3VBhTh7DDW/q3ewzwYRWnqNJokX9BEnxKMiXXaIeTEBq4k2dw==";
       };
     };
     "@polymer/paper-styles-3.0.1" = {
@@ -229,13 +229,13 b' let'
         sha1 = "e7365648c1b42136a59c7d5040637b3b5c83b614";
       };
     };
-    "@types/node-6.14.2" = {
+    "@types/node-6.14.3" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "6.14.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-6.14.2.tgz";
-        sha512 = "JWB3xaVfsfnFY8Ofc9rTB/op0fqqTSqy4vBcVk1LuRJvta7KTX+D//fCkiTMeLGhdr2EbFZzQjC97gvmPilk9Q==";
+      version = "6.14.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-6.14.3.tgz";
+        sha512 = "V2VrQBCKo4U0rni6tW4AASRDqIO5ZTLDN/Xzrm4mNBr9SGQYZ+7zZJn+hMs89Q8ZCIHzp4aWQPyCpK+rux1YGA==";
       };
     };
     "@types/parse5-2.2.34" = {
@@ -409,22 +409,22 b' let'
         sha512 = "mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA==";
       };
     };
-    "@webcomponents/shadycss-1.7.1" = {
+    "@webcomponents/shadycss-1.9.0" = {
       name = "_at_webcomponents_slash_shadycss";
       packageName = "@webcomponents/shadycss";
-      version = "1.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.7.1.tgz";
-        sha512 = "6SZqLajRPWL0rrKDZOGF8PCBq5B9JqgFmE5rX5psk6i8WrqiMkSCuO8+rnirzViTsU5CqnjQPFC3OvG4YJdMrQ==";
-      };
-    };
-    "@webcomponents/webcomponentsjs-2.2.1" = {
+      version = "1.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.9.0.tgz";
+        sha512 = "g8Xa+6RSEME4g/wLJW4YII0eq15rvXp76RxPAuv7hx+Bdoi7GzZJ/EoZOUfyIbqAsQbII1TcWD4/+Xhs5NcM1w==";
+      };
+    };
+    "@webcomponents/webcomponentsjs-2.2.7" = {
       name = "_at_webcomponents_slash_webcomponentsjs";
       packageName = "@webcomponents/webcomponentsjs";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.1.tgz";
-        sha512 = "lZZ+Lkke6JhsJcQQqSVk1Pny6/8y4qhJ98LO7a/MwBSRO8WqHqK1X2vscfeL8vOnYGFnmBUyVG95lwYv/AXyLQ==";
+      version = "2.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.7.tgz";
+        sha512 = "kPPjzV+5kpoWpTniyvBSPcXS33f3j/C6HvNOJ3YecF3pvz3XwVeU4ammbxtVy/osF3z7hr1DYNptIf4oPEvXZA==";
       };
     };
     "@xtuc/ieee754-1.2.0" = {
@@ -499,22 +499,22 b' let'
         sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
       };
     };
-    "ajv-6.6.2" = {
+    "ajv-6.9.2" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz";
-        sha512 = "FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==";
-      };
-    };
-    "ajv-keywords-3.2.0" = {
+      version = "6.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz";
+        sha512 = "4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==";
+      };
+    };
+    "ajv-keywords-3.4.0" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz";
-        sha1 = "e86b819c602cf8821ad637413698f1dec021847a";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz";
+        sha512 = "aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==";
       };
     };
     "align-text-0.1.4" = {
@@ -716,15 +716,6 b' let'
         sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
       };
     };
-    "arrify-1.0.1" = {
-      name = "arrify";
-      packageName = "arrify";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz";
-        sha1 = "898508da2226f380df904728456849c1501a4b0d";
-      };
-    };
     "asap-2.0.6" = {
       name = "asap";
       packageName = "asap";
@@ -815,13 +806,13 b' let'
         sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
       };
     };
-    "async-2.6.1" = {
+    "async-2.6.2" = {
       name = "async";
       packageName = "async";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz";
-        sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==";
+      version = "2.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz";
+        sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==";
       };
     };
     "async-each-1.0.1" = {
@@ -1445,13 +1436,13 b' let'
         sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==";
       };
     };
-    "binary-extensions-1.12.0" = {
+    "binary-extensions-1.13.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz";
-        sha512 = "DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==";
+      version = "1.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.0.tgz";
+        sha512 = "EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==";
       };
     };
     "bluebird-3.5.3" = {
@@ -1679,22 +1670,22 b' let'
         sha1 = "b534e7c734c4f81ec5fbe8aca2ad24354b962c6c";
       };
     };
-    "caniuse-db-1.0.30000927" = {
+    "caniuse-db-1.0.30000939" = {
       name = "caniuse-db";
       packageName = "caniuse-db";
-      version = "1.0.30000927";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000927.tgz";
-        sha512 = "CX/QvLA8oh7kQ9cHCCzFm0UZW4KwSyQSRJ5A1XtH42HaMJQ0yh+9fEVWagMqv9I1vSCtaqA5Mb8k0uKfv7jhDw==";
-      };
-    };
-    "caniuse-lite-1.0.30000927" = {
+      version = "1.0.30000939";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000939.tgz";
+        sha512 = "nB5tLf3hOs+biXl1lhKjHRgNC0J1I7H52h/t1FP7qxARKKwpB0z+P/JewJLYAlxCBP/q7rxJzQzHHrQMl0viKg==";
+      };
+    };
+    "caniuse-lite-1.0.30000939" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30000927";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000927.tgz";
-        sha512 = "ogq4NbUWf1uG/j66k0AmiO3GjqJAlQyF8n4w8a954cbCyFKmYGvRtgz6qkq2fWuduTXHibX7GyYL5Pg58Aks2g==";
+      version = "1.0.30000939";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz";
+        sha512 = "oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg==";
       };
     };
     "caseless-0.12.0" = {
@@ -1742,13 +1733,13 b' let'
         sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
       };
     };
-    "chokidar-2.0.4" = {
+    "chokidar-2.1.2" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz";
-        sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz";
+        sha512 = "IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==";
       };
     };
     "chownr-1.1.1" = {
@@ -2093,13 +2084,13 b' let'
         sha512 = "Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==";
       };
     };
-    "core-js-2.6.1" = {
+    "core-js-2.6.5" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz";
-        sha512 = "L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==";
+      version = "2.6.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz";
+        sha512 = "klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -2201,13 +2192,13 b' let'
         sha512 = "xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==";
       };
     };
-    "css-what-2.1.2" = {
+    "css-what-2.1.3" = {
       name = "css-what";
       packageName = "css-what";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz";
-        sha512 = "wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz";
+        sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==";
       };
     };
     "cssesc-0.1.0" = {
@@ -2417,13 +2408,13 b' let'
         sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
       };
     };
-    "dir-glob-2.0.0" = {
+    "dir-glob-2.2.2" = {
       name = "dir-glob";
       packageName = "dir-glob";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz";
-        sha512 = "37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz";
+        sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==";
       };
     };
     "dom-converter-0.2.0" = {
@@ -2435,13 +2426,13 b' let'
         sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==";
       };
     };
-    "dom-serializer-0.1.0" = {
+    "dom-serializer-0.1.1" = {
       name = "dom-serializer";
       packageName = "dom-serializer";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
-        sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz";
+        sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==";
       };
     };
     "dom5-2.3.0" = {
@@ -2462,15 +2453,6 b' let'
         sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==";
       };
     };
-    "domelementtype-1.1.3" = {
-      name = "domelementtype";
-      packageName = "domelementtype";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
-        sha1 = "bd28773e2642881aec51544924299c5cd822185b";
-      };
-    };
     "domelementtype-1.3.1" = {
       name = "domelementtype";
       packageName = "domelementtype";
@@ -2480,15 +2462,6 b' let'
         sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
-    "domhandler-2.1.0" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz";
-        sha1 = "d2646f5e57f6c3bab11cf6cb05d3c0acf7412594";
-      };
-    };
     "domhandler-2.3.0" = {
       name = "domhandler";
       packageName = "domhandler";
@@ -2498,15 +2471,6 b' let'
         sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
       };
     };
-    "domutils-1.1.6" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz";
-        sha1 = "bddc3de099b9a2efacc51c623f28f416ecc57485";
-      };
-    };
     "domutils-1.5.1" = {
       name = "domutils";
       packageName = "domutils";
@@ -2516,13 +2480,13 b' let'
         sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
       };
     };
-    "duplexify-3.6.1" = {
+    "duplexify-3.7.1" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz";
-        sha512 = "vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==";
+      version = "3.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz";
+        sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==";
       };
     };
     "ecc-jsbn-0.1.2" = {
@@ -2534,13 +2498,13 b' let'
         sha1 = "3a83a904e54353287874c564b7549386849a98c9";
       };
     };
-    "electron-to-chromium-1.3.98" = {
+    "electron-to-chromium-1.3.113" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.98";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.98.tgz";
-        sha512 = "WIZdNuvE3dFr6kkPgv4d/cfswNZD6XbeLBM8baOIQTsnbf4xWrVEaLvp7oNnbnMWWXDqq7Tbv+H5JfciLTJm4Q==";
+      version = "1.3.113";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz";
+        sha512 = "De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==";
       };
     };
     "elliptic-6.4.1" = {
@@ -2732,13 +2696,13 b' let'
         sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
       };
     };
-    "events-1.1.1" = {
+    "events-3.0.0" = {
       name = "events";
       packageName = "events";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz";
-        sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/events/-/events-3.0.0.tgz";
+        sha512 = "Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==";
       };
     };
     "evp_bytestokey-1.0.3" = {
@@ -2975,13 +2939,13 b' let'
         sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782";
       };
     };
-    "flush-write-stream-1.0.3" = {
+    "flush-write-stream-1.1.1" = {
       name = "flush-write-stream";
       packageName = "flush-write-stream";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz";
-        sha512 = "calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz";
+        sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==";
       };
     };
     "for-in-1.0.2" = {
@@ -3056,13 +3020,13 b' let'
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-1.2.4" = {
+    "fsevents-1.2.7" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz";
-        sha512 = "z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==";
+      version = "1.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz";
+        sha512 = "Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==";
       };
     };
     "function-bind-1.1.1" = {
@@ -3524,13 +3488,13 b' let'
         sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8";
       };
     };
-    "homedir-polyfill-1.0.1" = {
+    "homedir-polyfill-1.0.3" = {
       name = "homedir-polyfill";
       packageName = "homedir-polyfill";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz";
-        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz";
+        sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==";
       };
     };
     "hooker-0.2.3" = {
@@ -3587,15 +3551,6 b' let'
         sha1 = "b01abbd723acaaa7b37b6af4492ebda03d9dd37b";
       };
     };
-    "htmlparser2-3.3.0" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz";
-        sha1 = "cc70d05a59f6542e43f0e685c982e14c924a9efe";
-      };
-    };
     "htmlparser2-3.8.3" = {
       name = "htmlparser2";
       packageName = "htmlparser2";
@@ -4145,13 +4100,13 b' let'
         sha1 = "dd8b74278b27102d29df63eae28308a8cfa1b583";
       };
     };
-    "js-base64-2.5.0" = {
+    "js-base64-2.5.1" = {
       name = "js-base64";
       packageName = "js-base64";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.0.tgz";
-        sha512 = "wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g==";
+      version = "2.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz";
+        sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==";
       };
     };
     "js-tokens-3.0.2" = {
@@ -4208,6 +4163,15 b' let'
         sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b";
       };
     };
+    "jshint-2.10.1" = {
+      name = "jshint";
+      packageName = "jshint";
+      version = "2.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jshint/-/jshint-2.10.1.tgz";
+        sha512 = "9GpPfKeffYBl7oBDX2lHPG16j0AM7D2bn3aLy9DaWTr6CWa0i/7UGhX8WLZ7V14QQnnr4hXbjauTLYg06F+HYw==";
+      };
+    };
     "jshint-2.9.7" = {
       name = "jshint";
       packageName = "jshint";
@@ -4370,13 +4334,13 b' let'
         sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec";
       };
     };
-    "loader-runner-2.3.1" = {
+    "loader-runner-2.4.0" = {
       name = "loader-runner";
       packageName = "loader-runner";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.1.tgz";
-        sha512 = "By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz";
+        sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==";
       };
     };
     "loader-utils-0.2.17" = {
@@ -4460,15 +4424,6 b' let'
         sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6";
       };
     };
-    "lodash.debounce-4.0.8" = {
-      name = "lodash.debounce";
-      packageName = "lodash.debounce";
-      version = "4.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz";
-        sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af";
-      };
-    };
     "lodash.isplainobject-4.0.6" = {
       name = "lodash.isplainobject";
       packageName = "lodash.isplainobject";
@@ -4613,13 +4568,13 b' let'
         sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==";
       };
     };
-    "mem-4.0.0" = {
+    "mem-4.1.0" = {
       name = "mem";
       packageName = "mem";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz";
-        sha512 = "WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-4.1.0.tgz";
+        sha512 = "I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg==";
       };
     };
     "memory-fs-0.4.1" = {
@@ -4658,22 +4613,22 b' let'
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-db-1.37.0" = {
+    "mime-db-1.38.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.37.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz";
-        sha512 = "R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==";
-      };
-    };
-    "mime-types-2.1.21" = {
+      version = "1.38.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz";
+        sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==";
+      };
+    };
+    "mime-types-2.1.22" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz";
-        sha512 = "3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==";
+      version = "2.1.22";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz";
+        sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==";
       };
     };
     "mimic-fn-1.2.0" = {
@@ -4775,13 +4730,13 b' let'
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
-    "moment-2.23.0" = {
+    "moment-2.24.0" = {
       name = "moment";
       packageName = "moment";
-      version = "2.23.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.23.0.tgz";
-        sha512 = "3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA==";
+      version = "2.24.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz";
+        sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==";
       };
     };
     "mousetrap-1.6.2" = {
@@ -4856,13 +4811,13 b' let'
         sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==";
       };
     };
-    "node-libs-browser-2.1.0" = {
+    "node-libs-browser-2.2.0" = {
       name = "node-libs-browser";
       packageName = "node-libs-browser";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz";
-        sha512 = "5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz";
+        sha512 = "5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==";
       };
     };
     "nopt-1.0.10" = {
@@ -4910,6 +4865,15 b' let'
         sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
       };
     };
+    "normalize-path-3.0.0" = {
+      name = "normalize-path";
+      packageName = "normalize-path";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz";
+        sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
+      };
+    };
     "normalize-range-0.1.2" = {
       name = "normalize-range";
       packageName = "normalize-range";
@@ -4991,13 +4955,13 b' let'
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     };
-    "object-keys-1.0.12" = {
+    "object-keys-1.1.0" = {
       name = "object-keys";
       packageName = "object-keys";
-      version = "1.0.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz";
-        sha512 = "FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz";
+        sha512 = "6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==";
       };
     };
     "object-visit-1.0.1" = {
@@ -5117,13 +5081,13 b' let'
         sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
       };
     };
-    "p-is-promise-1.1.0" = {
+    "p-is-promise-2.0.0" = {
       name = "p-is-promise";
       packageName = "p-is-promise";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz";
-        sha1 = "9c9456989e9f6588017b0434d56097675c3da05e";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz";
+        sha512 = "pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==";
       };
     };
     "p-limit-1.3.0" = {
@@ -5180,13 +5144,13 b' let'
         sha512 = "hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==";
       };
     };
-    "pako-1.0.7" = {
+    "pako-1.0.8" = {
       name = "pako";
       packageName = "pako";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-1.0.7.tgz";
-        sha512 = "3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ==";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.8.tgz";
+        sha512 = "6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA==";
       };
     };
     "parallel-transform-1.1.0" = {
@@ -5207,13 +5171,13 b' let'
         sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
       };
     };
-    "parse-asn1-5.1.1" = {
+    "parse-asn1-5.1.4" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz";
-        sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==";
+      version = "5.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz";
+        sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==";
       };
     };
     "parse-filepath-1.0.2" = {
@@ -5927,13 +5891,13 b' let'
         sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
       };
     };
-    "randombytes-2.0.6" = {
+    "randombytes-2.1.0" = {
       name = "randombytes";
       packageName = "randombytes";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz";
-        sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz";
+        sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==";
       };
     };
     "randomfill-1.0.4" = {
@@ -5954,15 +5918,6 b' let'
         sha512 = "guh4ZNAf96f+CDwfnPbFeFiO5YcfPllUmZrgcoOmx6iqZPq+DcKbnyjPuBxEAtQ3tqqd++qChsQfQB+VBzFT0Q==";
       };
     };
-    "readable-stream-1.0.34" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "1.0.34";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz";
-        sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
-      };
-    };
     "readable-stream-1.1.14" = {
       name = "readable-stream";
       packageName = "readable-stream";
@@ -6116,13 +6071,13 b' let'
         sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
       };
     };
-    "renderkid-2.0.2" = {
+    "renderkid-2.0.3" = {
       name = "renderkid";
       packageName = "renderkid";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.2.tgz";
-        sha512 = "FsygIxevi1jSiPY9h7vZmBFUbAOcbYm9UwyiLNdVsLRs/5We9Ob5NMPbGYUTWiLq5L+ezlVdE0A8bbME5CWTpg==";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz";
+        sha512 = "z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==";
       };
     };
     "repeat-element-1.1.3" = {
@@ -6179,13 +6134,13 b' let'
         sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
       };
     };
-    "resolve-1.9.0" = {
+    "resolve-1.10.0" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz";
-        sha512 = "TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz";
+        sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==";
       };
     };
     "resolve-cwd-2.0.0" = {
@@ -6593,13 +6548,13 b' let'
         sha1 = "04e6926f662895354f3dd015203633b857297e2c";
       };
     };
-    "sshpk-1.16.0" = {
+    "sshpk-1.16.1" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.16.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz";
-        sha512 = "Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==";
+      version = "1.16.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
+        sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
       };
     };
     "ssri-5.3.0" = {
@@ -6629,13 +6584,13 b' let'
         sha1 = "142bf6b64c2b416e4b707ebf8f09b8b5a5043877";
       };
     };
-    "stream-browserify-2.0.1" = {
+    "stream-browserify-2.0.2" = {
       name = "stream-browserify";
       packageName = "stream-browserify";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz";
-        sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz";
+        sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==";
       };
     };
     "stream-each-1.2.3" = {
@@ -6872,13 +6827,13 b' let'
         sha512 = "YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==";
       };
     };
-    "tiny-emitter-2.0.2" = {
+    "tiny-emitter-2.1.0" = {
       name = "tiny-emitter";
       packageName = "tiny-emitter";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz";
-        sha512 = "2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz";
+        sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==";
       };
     };
     "tiny-lr-fork-0.0.5" = {
@@ -7223,13 +7178,13 b' let'
         sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
       };
     };
-    "util-0.10.4" = {
+    "util-0.11.1" = {
       name = "util";
       packageName = "util";
-      version = "0.10.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz";
-        sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==";
+      version = "0.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz";
+        sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -7536,14 +7491,14 b' let'
       sources."@polymer/paper-behaviors-3.0.1"
       sources."@polymer/paper-button-3.0.1"
       sources."@polymer/paper-ripple-3.0.1"
-      sources."@polymer/paper-spinner-3.0.1"
+      sources."@polymer/paper-spinner-3.0.2"
       sources."@polymer/paper-styles-3.0.1"
       sources."@polymer/paper-toast-3.0.1"
       sources."@polymer/paper-toggle-button-3.0.1"
       sources."@polymer/paper-tooltip-3.0.1"
       sources."@polymer/polymer-3.1.0"
       sources."@types/clone-0.1.30"
-      sources."@types/node-6.14.2"
+      sources."@types/node-6.14.3"
       sources."@types/parse5-2.2.34"
       sources."@webassemblyjs/ast-1.7.10"
       sources."@webassemblyjs/floating-point-hex-parser-1.7.10"
@@ -7563,8 +7518,8 b' let'
       sources."@webassemblyjs/wasm-parser-1.7.10"
       sources."@webassemblyjs/wast-parser-1.7.10"
       sources."@webassemblyjs/wast-printer-1.7.10"
-      sources."@webcomponents/shadycss-1.7.1"
-      sources."@webcomponents/webcomponentsjs-2.2.1"
+      sources."@webcomponents/shadycss-1.9.0"
+      sources."@webcomponents/webcomponentsjs-2.2.7"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.1"
       sources."abbrev-1.1.1"
@@ -7576,7 +7531,7 b' let'
         ];
       })
       sources."ajv-4.11.8"
-      sources."ajv-keywords-3.2.0"
+      sources."ajv-keywords-3.4.0"
       (sources."align-text-0.1.4" // {
         dependencies = [
           sources."kind-of-3.2.2"
@@ -7586,7 +7541,11 b' let'
       sources."amdefine-1.0.1"
       sources."ansi-regex-0.2.1"
       sources."ansi-styles-1.1.0"
-      sources."anymatch-2.0.0"
+      (sources."anymatch-2.0.0" // {
+        dependencies = [
+          sources."normalize-path-2.1.1"
+        ];
+      })
       sources."appenlight-client-git+https://[e-mail]/AppEnlight/appenlight-client-js.git#0.5.1"
       sources."aproba-1.2.0"
       (sources."argparse-0.1.16" // {
@@ -7602,7 +7561,6 b' let'
       sources."array-union-1.0.2"
       sources."array-uniq-1.0.3"
       sources."array-unique-0.3.2"
-      sources."arrify-1.0.1"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."asn1.js-4.10.1"
@@ -7738,7 +7696,7 b' let'
       sources."base64-js-1.3.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
-      sources."binary-extensions-1.12.0"
+      sources."binary-extensions-1.13.0"
       sources."bluebird-3.5.3"
       sources."bn.js-4.11.8"
       sources."boolbase-1.0.0"
@@ -7778,12 +7736,12 b' let'
           sources."browserslist-1.7.7"
         ];
       })
-      sources."caniuse-db-1.0.30000927"
-      sources."caniuse-lite-1.0.30000927"
+      sources."caniuse-db-1.0.30000939"
+      sources."caniuse-lite-1.0.30000939"
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
       sources."chalk-0.5.1"
-      (sources."chokidar-2.0.4" // {
+      (sources."chokidar-2.1.2" // {
         dependencies = [
           sources."is-glob-4.0.0"
         ];
@@ -7876,7 +7834,7 b' let'
           sources."minimatch-3.0.4"
         ];
       })
-      sources."core-js-2.6.1"
+      sources."core-js-2.6.5"
       sources."core-util-is-1.0.2"
       sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
@@ -7896,7 +7854,7 b' let'
           sources."regexpu-core-1.0.0"
         ];
       })
-      sources."css-what-2.1.2"
+      sources."css-what-2.1.3"
       sources."cssesc-0.1.0"
       sources."cssnano-3.10.0"
       sources."csso-2.3.2"
@@ -7921,11 +7879,10 b' let'
       sources."detect-file-1.0.0"
       sources."detect-indent-4.0.0"
       sources."diffie-hellman-5.0.3"
-      sources."dir-glob-2.0.0"
+      sources."dir-glob-2.2.2"
       sources."dom-converter-0.2.0"
-      (sources."dom-serializer-0.1.0" // {
-        dependencies = [
-          sources."domelementtype-1.1.3"
+      (sources."dom-serializer-0.1.1" // {
+        dependencies = [
           sources."entities-1.1.2"
         ];
       })
@@ -7939,14 +7896,14 b' let'
       sources."domelementtype-1.3.1"
       sources."domhandler-2.3.0"
       sources."domutils-1.5.1"
-      (sources."duplexify-3.6.1" // {
+      (sources."duplexify-3.7.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
         ];
       })
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.98"
+      sources."electron-to-chromium-1.3.113"
       sources."elliptic-6.4.1"
       sources."emojis-list-2.1.0"
       sources."end-of-stream-1.4.1"
@@ -7968,7 +7925,7 b' let'
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."eventemitter2-0.4.14"
-      sources."events-1.1.1"
+      sources."events-3.0.0"
       sources."evp_bytestokey-1.0.3"
       sources."execa-1.0.0"
       sources."exit-0.1.2"
@@ -8028,7 +7985,7 b' let'
       sources."fined-1.1.1"
       sources."flagged-respawn-1.0.1"
       sources."flatten-1.0.2"
-      (sources."flush-write-stream-1.0.3" // {
+      (sources."flush-write-stream-1.1.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
@@ -8051,7 +8008,7 b' let'
         ];
       })
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.4"
+      sources."fsevents-1.2.7"
       sources."function-bind-1.1.1"
       sources."gaze-0.5.2"
       sources."get-caller-file-1.0.3"
@@ -8115,12 +8072,18 b' let'
           sources."supports-color-2.0.0"
         ];
       })
-      sources."grunt-contrib-jshint-0.12.0"
+      (sources."grunt-contrib-jshint-0.12.0" // {
+        dependencies = [
+          sources."jshint-2.9.7"
+          sources."lodash-4.17.11"
+          sources."minimatch-3.0.4"
+        ];
+      })
       (sources."grunt-contrib-less-1.4.1" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
           sources."ansi-styles-2.2.1"
-          sources."async-2.6.1"
+          sources."async-2.6.2"
           sources."chalk-1.1.3"
           sources."has-ansi-2.0.0"
           sources."lodash-4.17.11"
@@ -8172,7 +8135,7 b' let'
       sources."hmac-drbg-1.0.1"
       sources."hoek-2.16.3"
       sources."home-or-tmp-2.0.0"
-      sources."homedir-polyfill-1.0.1"
+      sources."homedir-polyfill-1.0.3"
       sources."hooker-0.2.3"
       sources."html-comment-regex-1.1.2"
       sources."html-loader-0.4.5"
@@ -8261,12 +8224,12 b' let'
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
       sources."jquery-1.11.3"
-      sources."js-base64-2.5.0"
+      sources."js-base64-2.5.1"
       sources."js-tokens-3.0.2"
       sources."js-yaml-2.0.5"
       sources."jsbn-0.1.1"
       sources."jsesc-1.3.0"
-      (sources."jshint-2.9.7" // {
+      (sources."jshint-2.10.1" // {
         dependencies = [
           sources."lodash-4.17.11"
           sources."minimatch-3.0.4"
@@ -8297,12 +8260,11 b' let'
           sources."findup-sync-2.0.0"
         ];
       })
-      sources."loader-runner-2.3.1"
+      sources."loader-runner-2.4.0"
       sources."loader-utils-1.2.3"
       sources."locate-path-2.0.0"
       sources."lodash-0.9.2"
       sources."lodash.camelcase-4.3.0"
-      sources."lodash.debounce-4.0.8"
       sources."lodash.isplainobject-4.0.6"
       sources."lodash.memoize-4.1.2"
       sources."lodash.uniq-4.5.0"
@@ -8318,7 +8280,7 b' let'
       sources."mark.js-8.11.1"
       sources."math-expression-evaluator-1.2.17"
       sources."md5.js-1.3.5"
-      sources."mem-4.0.0"
+      sources."mem-4.1.0"
       (sources."memory-fs-0.4.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
@@ -8328,8 +8290,8 b' let'
       sources."micromatch-3.1.10"
       sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
-      sources."mime-db-1.37.0"
-      sources."mime-types-2.1.21"
+      sources."mime-db-1.38.0"
+      sources."mime-types-2.1.22"
       sources."mimic-fn-1.2.0"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
@@ -8346,7 +8308,7 b' let'
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.23.0"
+      sources."moment-2.24.0"
       sources."mousetrap-1.6.2"
       (sources."move-concurrently-1.0.1" // {
         dependencies = [
@@ -8361,7 +8323,7 b' let'
       sources."neo-async-2.6.0"
       sources."nice-try-1.0.5"
       sources."no-case-2.3.2"
-      (sources."node-libs-browser-2.1.0" // {
+      (sources."node-libs-browser-2.2.0" // {
         dependencies = [
           (sources."readable-stream-2.3.6" // {
             dependencies = [
@@ -8377,7 +8339,7 b' let'
           sources."nopt-2.0.0"
         ];
       })
-      sources."normalize-path-2.1.1"
+      sources."normalize-path-3.0.0"
       sources."normalize-range-0.1.2"
       sources."normalize-url-1.9.1"
       sources."npm-run-path-2.0.2"
@@ -8399,7 +8361,7 b' let'
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-keys-1.0.12"
+      sources."object-keys-1.1.0"
       sources."object-visit-1.0.1"
       sources."object.defaults-1.1.0"
       sources."object.getownpropertydescriptors-2.0.3"
@@ -8413,11 +8375,11 b' let'
       sources."osenv-0.1.5"
       sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
-      sources."p-is-promise-1.1.0"
+      sources."p-is-promise-2.0.0"
       sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
-      sources."pako-1.0.7"
+      sources."pako-1.0.8"
       (sources."parallel-transform-1.1.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
@@ -8425,7 +8387,7 b' let'
         ];
       })
       sources."param-case-2.1.1"
-      sources."parse-asn1-5.1.1"
+      sources."parse-asn1-5.1.4"
       sources."parse-filepath-1.0.2"
       sources."parse-passwd-1.0.0"
       sources."parse5-3.0.3"
@@ -8564,7 +8526,7 b' let'
       sources."query-string-4.3.4"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
-      sources."randombytes-2.0.6"
+      sources."randombytes-2.1.0"
       sources."randomfill-1.0.4"
       sources."raw-loader-1.0.0-beta.0"
       (sources."readable-stream-1.1.14" // {
@@ -8608,14 +8570,9 b' let'
       })
       sources."relateurl-0.2.7"
       sources."remove-trailing-separator-1.1.0"
-      (sources."renderkid-2.0.2" // {
+      (sources."renderkid-2.0.3" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
-          sources."domhandler-2.1.0"
-          sources."domutils-1.1.6"
-          sources."htmlparser2-3.3.0"
-          sources."isarray-0.0.1"
-          sources."readable-stream-1.0.34"
           sources."strip-ansi-3.0.1"
         ];
       })
@@ -8625,7 +8582,7 b' let'
       sources."request-2.81.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."resolve-1.9.0"
+      sources."resolve-1.10.0"
       sources."resolve-cwd-2.0.0"
       sources."resolve-dir-1.0.1"
       sources."resolve-from-3.0.0"
@@ -8641,7 +8598,7 b' let'
       sources."sax-1.2.4"
       (sources."schema-utils-0.4.7" // {
         dependencies = [
-          sources."ajv-6.6.2"
+          sources."ajv-6.9.2"
         ];
       })
       sources."select-1.1.2"
@@ -8698,7 +8655,7 b' let'
       sources."source-map-url-0.4.0"
       sources."split-string-3.1.0"
       sources."sprintf-js-1.0.3"
-      (sources."sshpk-1.16.0" // {
+      (sources."sshpk-1.16.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -8722,7 +8679,7 b' let'
         ];
       })
       sources."sticky-sidebar-3.3.1"
-      (sources."stream-browserify-2.0.1" // {
+      (sources."stream-browserify-2.0.2" // {
         dependencies = [
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
@@ -8768,7 +8725,7 b' let'
         ];
       })
       sources."timers-browserify-2.0.10"
-      sources."tiny-emitter-2.0.2"
+      sources."tiny-emitter-2.1.0"
       (sources."tiny-lr-fork-0.0.5" // {
         dependencies = [
           sources."debug-0.7.4"
@@ -8857,7 +8814,7 b' let'
         ];
       })
       sources."use-3.1.1"
-      sources."util-0.10.4"
+      sources."util-0.11.1"
       sources."util-deprecate-1.0.2"
       sources."util.promisify-1.0.0"
       sources."utila-0.4.0"
@@ -8879,7 +8836,7 b' let'
       sources."waypoints-4.0.1"
       (sources."webpack-4.23.1" // {
         dependencies = [
-          sources."ajv-6.6.2"
+          sources."ajv-6.9.2"
         ];
       })
       (sources."webpack-cli-3.1.2" // {

pkgs/python-packages.nix

@@ -199,14 +199,14 b' self: super: {'
     };
   };
   "cffi" = super.buildPythonPackage {
-    name = "cffi-1.12.1";
+    name = "cffi-1.12.2";
     doCheck = false;
     propagatedBuildInputs = [
       self."pycparser"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/bc/81/47bd0404f2cb5363edb371e3b15da6387b5e9b80122e5b81be8b8f411e9b/cffi-1.12.1.tar.gz";
-      sha256 = "0cw0dzynw34zi75h674y3bgas6axfjyw1h6hj6ic2llcwyj7nvwv";
+      url = "https://files.pythonhosted.org/packages/64/7c/27367b38e6cc3e1f49f193deb761fe75cda9f95da37b67b422e62281fcac/cffi-1.12.2.tar.gz";
+      sha256 = "19qfks2djya8vix95bmg3xzipjb8w9b8mbj4j5k2hqkc8j58f4z1";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -321,7 +321,7 b' self: super: {'
     };
   };
   "cryptography" = super.buildPythonPackage {
-    name = "cryptography-2.5";
+    name = "cryptography-2.6.1";
     doCheck = false;
     propagatedBuildInputs = [
       self."asn1crypto"
@@ -331,8 +331,8 b' self: super: {'
       self."ipaddress"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/69/ed/5e97b7f54237a9e4e6291b6e52173372b7fa45ca730d36ea90b790c0059a/cryptography-2.5.tar.gz";
-      sha256 = "00c4d7gvsymlaw0r13zrm32dcnarmpayjyrh65yymlmr6mrbcij9";
+      url = "https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff92f3563476c3b00d0a9157d9c0217449/cryptography-2.6.1.tar.gz";
+      sha256 = "19iwz5avym5zl6jrrrkym1rdaa9h61j20ph4cswsqgv8xg5j3j16";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal { fullName = "BSD or Apache License, Version 2.0"; } pkgs.lib.licenses.asl20 ];
@@ -666,11 +666,11 b' self: super: {'
     };
   };
   "hupper" = super.buildPythonPackage {
-    name = "hupper-1.5";
+    name = "hupper-1.6";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/89/f1/aace4ea69c1d79e243e48a81dcf1608c87e8c5a190e6ef80fae245d494ac/hupper-1.5.tar.gz";
-      sha256 = "02n6y2rvpacm2w3x089whj64j1x0qlkimkzw35r1g0mymmxicfk9";
+      url = "https://files.pythonhosted.org/packages/a4/f7/595756fdfdf896d2c46ae6dc25b1bc97645d0fbf2d6ca547b5b55728eaf3/hupper-1.6.tar.gz";
+      sha256 = "0p30l0pk63js0c0hl57c0dvffmawkwhh4yjmfaqyzgwdpdb0g3fc";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1759,8 +1759,8 b' self: super: {'
       self."beaker"
       self."bleach"
       self."celery"
-      self."chameleon"
       self."channelstream"
+      self."cryptography"
       self."click"
       self."colander"
       self."configobj"
@@ -1770,7 +1770,6 b' self: super: {'
       self."docutils"
       self."dogpile.cache"
       self."dogpile.core"
-      self."ecdsa"
       self."formencode"
       self."future"
       self."futures"
@@ -1797,7 +1796,6 b' self: super: {'
       self."pyparsing"
       self."pyramid-beaker"
       self."pyramid-debugtoolbar"
-      self."pyramid-jinja2"
       self."pyramid-mako"
       self."pyramid"
       self."pyramid-mailer"
@@ -1820,7 +1818,6 b' self: super: {'
       self."sshpubkeys"
       self."subprocess32"
       self."supervisor"
-      self."tempita"
       self."translationstring"
       self."urllib3"
       self."urlobject"
@@ -1913,11 +1910,11 b' self: super: {'
     };
   };
   "scandir" = super.buildPythonPackage {
-    name = "scandir-1.9.0";
+    name = "scandir-1.10.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/16/2a/557af1181e6b4e30254d5a6163b18f5053791ca66e251e77ab08887e8fe3/scandir-1.9.0.tar.gz";
-      sha256 = "0r3hvf1a9jm1rkqgx40gxkmccknkaiqjavs8lccgq9s8khh5x5s4";
+      url = "https://files.pythonhosted.org/packages/df/f5/9c052db7bd54d0cbf1bc0bb6554362bba1012d03e5888950a4f5c5dadc4e/scandir-1.10.0.tar.gz";
+      sha256 = "1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal { fullName = "New BSD License"; } ];

requirements.txt

@@ -9,19 +9,18 b' babel==1.3'
 beaker==1.9.1
 bleach==3.1.0
 celery==4.1.1
-chameleon==2.24
 channelstream==0.5.2
 click==7.0
 colander==1.7.0
 # our custom configobj
 https://code.rhodecode.com/upstream/configobj/archive/a11ff0a0bd4fbda9e3a91267e720f88329efb4a6.tar.gz?md5=9916c524ea11a6c418217af6b28d4b3c#egg=configobj==5.0.6
 cssselect==1.0.3
+cryptography==2.6.1
 decorator==4.1.2
 deform==2.0.7
 docutils==0.14.0
 dogpile.cache==0.7.1
 dogpile.core==0.4.1
-ecdsa==0.13
 formencode==1.2.4
 future==0.14.3
 futures==3.0.2
@@ -48,7 +47,6 b' pygments==2.3.1'
 pyparsing==2.3.0
 pyramid-beaker==0.8
 pyramid-debugtoolbar==4.5.0
-pyramid-jinja2==2.7
 pyramid-mako==1.0.2
 pyramid==1.10.1
 pyramid_mailer==0.15.1
@@ -71,7 +69,6 b' sqlalchemy==1.1.18'
 sshpubkeys==3.1.0
 subprocess32==3.5.3
 supervisor==3.3.5
-tempita==0.5.2
 translationstring==1.3
 urllib3==1.24.1
 urlobject==2.4.3

requirements_pinned.txt

@@ -3,9 +3,15 b''
 atomicwrites==1.2.1
 attrs==18.2.0
 billiard==3.5.0.3
+chameleon==2.24
+cffi==1.12.2
+ecdsa==0.13
+hupper==1.6
 gnureadline==6.3.8
 jinja2==2.9.6
 jsonschema==2.6.0
 pathlib2==2.3.3
+pyramid-jinja2==2.7
 setproctitle==1.1.10
-
+scandir==1.10.0
+tempita==0.5.2

rhodecode/apps/admin/tests/test_admin_settings.py

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

rhodecode/apps/gist/views.py

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

rhodecode/apps/home/views.py

@@ -33,7 +33,7 b' from rhodecode.lib.index import searcher'
 from rhodecode.lib.utils2 import safe_unicode, str2bool, safe_int
 from rhodecode.lib.ext_json import json
 from rhodecode.model.db import (
-    func, true, or_, in_filter_generator, Repository, RepoGroup, User, UserGroup)
+    func, true, or_, case, in_filter_generator, Repository, RepoGroup, User, UserGroup)
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.scm import RepoGroupList, RepoList
@@ -105,21 +105,27 b' class HomeView(BaseAppView):'
 
         return {'suggestions': _user_groups}
 
-    def _get_repo_list(self, name_contains=None, repo_type=None, limit=20):
+    def _get_repo_list(self, name_contains=None, repo_type=None, repo_group_name='', limit=20):
         org_query = name_contains
         allowed_ids = self._rhodecode_user.repo_acl_ids(
             ['repository.read', 'repository.write', 'repository.admin'],
             cache=False, name_filter=name_contains) or [-1]
 
         query = Repository.query()\
-            .order_by(func.length(Repository.repo_name))\
-            .order_by(Repository.repo_name)\
             .filter(Repository.archived.isnot(true()))\
             .filter(or_(
                 # generate multiple IN to fix limitation problems
                 *in_filter_generator(Repository.repo_id, allowed_ids)
             ))
 
+        query = query.order_by(case(
+            [
+                (Repository.repo_name.startswith(repo_group_name), repo_group_name+'/'),
+            ],
+        ))
+        query = query.order_by(func.length(Repository.repo_name))
+        query = query.order_by(Repository.repo_name)
+
         if repo_type:
             query = query.filter(Repository.repo_type == repo_type)
 
@@ -145,20 +151,26 b' class HomeView(BaseAppView):'
             }
             for obj in acl_iter]
 
-    def _get_repo_group_list(self, name_contains=None, limit=20):
+    def _get_repo_group_list(self, name_contains=None, repo_group_name='', limit=20):
         org_query = name_contains
         allowed_ids = self._rhodecode_user.repo_group_acl_ids(
             ['group.read', 'group.write', 'group.admin'],
             cache=False, name_filter=name_contains) or [-1]
 
         query = RepoGroup.query()\
-            .order_by(func.length(RepoGroup.group_name))\
-            .order_by(RepoGroup.group_name) \
             .filter(or_(
                 # generate multiple IN to fix limitation problems
                 *in_filter_generator(RepoGroup.group_id, allowed_ids)
             ))
 
+        query = query.order_by(case(
+            [
+                (RepoGroup.group_name.startswith(repo_group_name), repo_group_name+'/'),
+            ],
+        ))
+        query = query.order_by(func.length(RepoGroup.group_name))
+        query = query.order_by(RepoGroup.group_name)
+
         if name_contains:
             ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
             query = query.filter(
@@ -183,11 +195,17 b' class HomeView(BaseAppView):'
     def _get_user_list(self, name_contains=None, limit=20):
         org_query = name_contains
         if not name_contains:
-            return []
+            return [], False
 
-        name_contains = re.compile('(?:user:)(.+)').findall(name_contains)
+        # TODO(marcink): should all logged in users be allowed to search others?
+        allowed_user_search = self._rhodecode_user.username != User.DEFAULT_USER
+        if not allowed_user_search:
+            return [], False
+
+        name_contains = re.compile('(?:user:[ ]?)(.+)').findall(name_contains)
         if len(name_contains) != 1:
-            return []
+            return [], False
+
         name_contains = name_contains[0]
 
         query = User.query()\
@@ -207,22 +225,28 b' class HomeView(BaseAppView):'
             {
                 'id': obj.user_id,
                 'value': org_query,
-                'value_display': obj.username,
+                'value_display': 'user: `{}`'.format(obj.username),
                 'type': 'user',
                 'icon_link': h.gravatar_url(obj.email, 30),
                 'url': h.route_path(
                     'user_profile', username=obj.username)
             }
-            for obj in acl_iter]
+            for obj in acl_iter], True
 
     def _get_user_groups_list(self, name_contains=None, limit=20):
         org_query = name_contains
         if not name_contains:
-            return []
+            return [], False
 
-        name_contains = re.compile('(?:user_group:)(.+)').findall(name_contains)
+        # TODO(marcink): should all logged in users be allowed to search others?
+        allowed_user_search = self._rhodecode_user.username != User.DEFAULT_USER
+        if not allowed_user_search:
+            return [], False
+
+        name_contains = re.compile('(?:user_group:[ ]?)(.+)').findall(name_contains)
         if len(name_contains) != 1:
-            return []
+            return [], False
+
         name_contains = name_contains[0]
 
         query = UserGroup.query()\
@@ -241,27 +265,34 b' class HomeView(BaseAppView):'
             {
                 'id': obj.users_group_id,
                 'value': org_query,
-                'value_display': obj.users_group_name,
+                'value_display': 'user_group: `{}`'.format(obj.users_group_name),
                 'type': 'user_group',
                 'url': h.route_path(
                     'user_group_profile', user_group_name=obj.users_group_name)
             }
-            for obj in acl_iter]
+            for obj in acl_iter], True
 
-    def _get_hash_commit_list(self, auth_user, searcher, query):
+    def _get_hash_commit_list(self, auth_user, searcher, query, repo=None, repo_group=None):
+        repo_name = repo_group_name = None
+        if repo:
+            repo_name = repo.repo_name
+        if repo_group:
+            repo_group_name = repo_group.group_name
+
         org_query = query
         if not query or len(query) < 3 or not searcher:
-            return []
+            return [], False
 
-        commit_hashes = re.compile('(?:commit:)([0-9a-f]{2,40})').findall(query)
+        commit_hashes = re.compile('(?:commit:[ ]?)([0-9a-f]{2,40})').findall(query)
 
         if len(commit_hashes) != 1:
-            return []
+            return [], False
+
         commit_hash = commit_hashes[0]
 
         result = searcher.search(
             'commit_id:{}*'.format(commit_hash), 'commit', auth_user,
-            raise_on_exc=False)
+            repo_name, repo_group_name, raise_on_exc=False)
 
         commits = []
         for entry in result['results']:
@@ -286,7 +317,55 b' class HomeView(BaseAppView):'
             }
 
             commits.append(commit_entry)
-        return commits
+        return commits, True
+
+    def _get_path_list(self, auth_user, searcher, query, repo=None, repo_group=None):
+        repo_name = repo_group_name = None
+        if repo:
+            repo_name = repo.repo_name
+        if repo_group:
+            repo_group_name = repo_group.group_name
+
+        org_query = query
+        if not query or len(query) < 3 or not searcher:
+            return [], False
+
+        paths_re = re.compile('(?:file:[ ]?)(.+)').findall(query)
+        if len(paths_re) != 1:
+            return [], False
+
+        file_path = paths_re[0]
+
+        search_path = searcher.escape_specials(file_path)
+        result = searcher.search(
+            'file.raw:*{}*'.format(search_path), 'path', auth_user,
+            repo_name, repo_group_name, raise_on_exc=False)
+
+        files = []
+        for entry in result['results']:
+            repo_data = {
+                'repository_id': entry.get('repository_id'),
+                'repository_type': entry.get('repo_type'),
+                'repository_name': entry.get('repository'),
+            }
+
+            file_entry = {
+                'id': entry['commit_id'],
+                'value': org_query,
+                'value_display': '`{}` file: {}'.format(
+                    entry['repository'], entry['file']),
+                'type': 'file',
+                'repo': entry['repository'],
+                'repo_data': repo_data,
+
+                'url': h.route_path(
+                    'repo_files',
+                    repo_name=entry['repository'], commit_id=entry['commit_id'],
+                    f_path=entry['file'])
+            }
+
+            files.append(file_entry)
+        return files, True
 
     @LoginRequired()
     @view_config(
@@ -364,17 +443,15 b' class HomeView(BaseAppView):'
                 qry = query
                 return {'q': qry, 'type': 'content'}
             label = u'File search for `{}` in this repository.'.format(query)
-            queries.append(
-                {
-                    'id': -10,
-                    'value': query,
-                    'value_display': label,
-                    'type': 'search',
-                    'url': h.route_path('search_repo',
-                                        repo_name=repo_name,
-                                        _query=query_modifier())
+            file_qry = {
+                'id': -10,
+                'value': query,
+                'value_display': label,
+                'type': 'search',
+                'url': h.route_path('search_repo',
+                                    repo_name=repo_name,
+                                    _query=query_modifier())
                 }
-            )
 
             # commits
             def query_modifier():
@@ -382,17 +459,22 b' class HomeView(BaseAppView):'
                 return {'q': qry, 'type': 'commit'}
 
             label = u'Commit search for `{}` in this repository.'.format(query)
-            queries.append(
-                {
-                    'id': -20,
-                    'value': query,
-                    'value_display': label,
-                    'type': 'search',
-                    'url': h.route_path('search_repo',
-                                        repo_name=repo_name,
-                                        _query=query_modifier())
+            commit_qry = {
+                'id': -20,
+                'value': query,
+                'value_display': label,
+                'type': 'search',
+                'url': h.route_path('search_repo',
+                                    repo_name=repo_name,
+                                    _query=query_modifier())
                 }
-            )
+
+            if repo_context in ['commit', 'changelog']:
+                queries.extend([commit_qry, file_qry])
+            elif repo_context in ['files', 'summary']:
+                queries.extend([file_qry, commit_qry])
+            else:
+                queries.extend([commit_qry, file_qry])
 
         elif is_es_6 and repo_group_name:
             # files
@@ -401,17 +483,15 b' class HomeView(BaseAppView):'
                 return {'q': qry, 'type': 'content'}
 
             label = u'File search for `{}` in this repository group'.format(query)
-            queries.append(
-                {
-                    'id': -30,
-                    'value': query,
-                    'value_display': label,
-                    'type': 'search',
-                    'url': h.route_path('search_repo_group',
-                                        repo_group_name=repo_group_name,
-                                        _query=query_modifier())
+            file_qry = {
+                'id': -30,
+                'value': query,
+                'value_display': label,
+                'type': 'search',
+                'url': h.route_path('search_repo_group',
+                                    repo_group_name=repo_group_name,
+                                    _query=query_modifier())
                 }
-            )
 
             # commits
             def query_modifier():
@@ -419,18 +499,24 b' class HomeView(BaseAppView):'
                 return {'q': qry, 'type': 'commit'}
 
             label = u'Commit search for `{}` in this repository group'.format(query)
-            queries.append(
-                {
-                    'id': -40,
-                    'value': query,
-                    'value_display': label,
-                    'type': 'search',
-                    'url': h.route_path('search_repo_group',
-                                        repo_group_name=repo_group_name,
-                                        _query=query_modifier())
+            commit_qry = {
+                'id': -40,
+                'value': query,
+                'value_display': label,
+                'type': 'search',
+                'url': h.route_path('search_repo_group',
+                                    repo_group_name=repo_group_name,
+                                    _query=query_modifier())
                 }
-            )
 
+            if repo_context in ['commit', 'changelog']:
+                queries.extend([commit_qry, file_qry])
+            elif repo_context in ['files', 'summary']:
+                queries.extend([file_qry, commit_qry])
+            else:
+                queries.extend([commit_qry, file_qry])
+
+        # Global, not scoped
         if not queries:
             queries.append(
                 {
@@ -469,54 +555,107 b' class HomeView(BaseAppView):'
         if not query:
             return {'suggestions': res}
 
+        def no_match(name):
+            return {
+                'id': -1,
+                'value': "",
+                'value_display': name,
+                'type': 'text',
+                'url': ""
+            }
         searcher = searcher_from_config(self.request.registry.settings)
-        for _q in self._get_default_search_queries(self.request.GET, searcher, query):
-            res.append(_q)
+        has_specialized_search = False
 
+        # set repo context
+        repo = None
+        repo_id = safe_int(self.request.GET.get('search_context[repo_id]'))
+        if repo_id:
+            repo = Repository.get(repo_id)
+
+        # set group context
+        repo_group = None
         repo_group_id = safe_int(self.request.GET.get('search_context[repo_group_id]'))
         if repo_group_id:
             repo_group = RepoGroup.get(repo_group_id)
-            composed_hint = '{}/{}'.format(repo_group.group_name, query)
-            show_hint = not query.startswith(repo_group.group_name)
-            if repo_group and show_hint:
-                hint = u'Repository search inside: `{}`'.format(composed_hint)
-                res.append({
-                    'id': -1,
-                    'value': composed_hint,
-                    'value_display': hint,
-                    'type': 'hint',
-                    'url': ""
-                })
+        prefix_match = False
+
+        # user: type search
+        if not prefix_match:
+            users, prefix_match = self._get_user_list(query)
+            if users:
+                has_specialized_search = True
+                for serialized_user in users:
+                    res.append(serialized_user)
+            elif prefix_match:
+                has_specialized_search = True
+                res.append(no_match('No matching users found'))
 
-        repo_groups = self._get_repo_group_list(query)
-        for serialized_repo_group in repo_groups:
-            res.append(serialized_repo_group)
+        # user_group: type search
+        if not prefix_match:
+            user_groups, prefix_match = self._get_user_groups_list(query)
+            if user_groups:
+                has_specialized_search = True
+                for serialized_user_group in user_groups:
+                    res.append(serialized_user_group)
+            elif prefix_match:
+                has_specialized_search = True
+                res.append(no_match('No matching user groups found'))
 
-        repos = self._get_repo_list(query)
-        for serialized_repo in repos:
-            res.append(serialized_repo)
+        # FTS commit: type search
+        if not prefix_match:
+            commits, prefix_match = self._get_hash_commit_list(
+                c.auth_user, searcher, query, repo, repo_group)
+            if commits:
+                has_specialized_search = True
+                unique_repos = collections.OrderedDict()
+                for commit in commits:
+                    repo_name = commit['repo']
+                    unique_repos.setdefault(repo_name, []).append(commit)
 
-        # TODO(marcink): should all logged in users be allowed to search others?
-        allowed_user_search = self._rhodecode_user.username != User.DEFAULT_USER
-        if allowed_user_search:
-            users = self._get_user_list(query)
-            for serialized_user in users:
-                res.append(serialized_user)
+                for _repo, commits in unique_repos.items():
+                    for commit in commits:
+                        res.append(commit)
+            elif prefix_match:
+                has_specialized_search = True
+                res.append(no_match('No matching commits found'))
 
-            user_groups = self._get_user_groups_list(query)
-            for serialized_user_group in user_groups:
-                res.append(serialized_user_group)
+        # FTS file: type search
+        if not prefix_match:
+            paths, prefix_match = self._get_path_list(
+                c.auth_user, searcher, query, repo, repo_group)
+            if paths:
+                has_specialized_search = True
+                unique_repos = collections.OrderedDict()
+                for path in paths:
+                    repo_name = path['repo']
+                    unique_repos.setdefault(repo_name, []).append(path)
 
-        commits = self._get_hash_commit_list(c.auth_user, searcher, query)
-        if commits:
-            unique_repos = collections.OrderedDict()
-            for commit in commits:
-                repo_name = commit['repo']
-                unique_repos.setdefault(repo_name, []).append(commit)
+                for repo, paths in unique_repos.items():
+                    for path in paths:
+                        res.append(path)
+            elif prefix_match:
+                has_specialized_search = True
+                res.append(no_match('No matching files found'))
+
+        # main suggestions
+        if not has_specialized_search:
+            repo_group_name = ''
+            if repo_group:
+                repo_group_name = repo_group.group_name
 
-            for repo, commits in unique_repos.items():
-                for commit in commits:
-                    res.append(commit)
+            for _q in self._get_default_search_queries(self.request.GET, searcher, query):
+                res.append(_q)
+
+            repo_groups = self._get_repo_group_list(query, repo_group_name=repo_group_name)
+            for serialized_repo_group in repo_groups:
+                res.append(serialized_repo_group)
+
+            repos = self._get_repo_list(query, repo_group_name=repo_group_name)
+            for serialized_repo in repos:
+                res.append(serialized_repo)
+
+            if not repos and not repo_groups:
+                res.append(no_match('No matches found'))
 
         return {'suggestions': res}
 

rhodecode/apps/repository/views/repo_summary.py

@@ -152,6 +152,26 b' class RepoSummaryView(RepoAppView):'
         c.comments = self.db_repo.get_comments(page_ids)
         c.statuses = self.db_repo.statuses(page_ids)
 
+    def _prepare_and_set_clone_url(self, c):
+        username = ''
+        if self._rhodecode_user.username != User.DEFAULT_USER:
+            username = safe_str(self._rhodecode_user.username)
+
+        _def_clone_uri = _def_clone_uri_id = c.clone_uri_tmpl
+        _def_clone_uri_ssh = c.clone_uri_ssh_tmpl
+
+        if '{repo}' in _def_clone_uri:
+            _def_clone_uri_id = _def_clone_uri.replace('{repo}', '_{repoid}')
+        elif '{repoid}' in _def_clone_uri:
+            _def_clone_uri_id = _def_clone_uri.replace('_{repoid}', '{repo}')
+
+        c.clone_repo_url = self.db_repo.clone_url(
+            user=username, uri_tmpl=_def_clone_uri)
+        c.clone_repo_url_id = self.db_repo.clone_url(
+            user=username, uri_tmpl=_def_clone_uri_id)
+        c.clone_repo_url_ssh = self.db_repo.clone_url(
+            uri_tmpl=_def_clone_uri_ssh, ssh=True)
+
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
@@ -160,6 +180,7 b' class RepoSummaryView(RepoAppView):'
         renderer='rhodecode:templates/summary/summary_commits.mako')
     def summary_commits(self):
         c = self.load_default_context()
+        self._prepare_and_set_clone_url(c)
         self._load_commits_context(c)
         return self._get_template_context(c)
 
@@ -179,26 +200,7 b' class RepoSummaryView(RepoAppView):'
         c = self.load_default_context()
 
         # Prepare the clone URL
-        username = ''
-        if self._rhodecode_user.username != User.DEFAULT_USER:
-            username = safe_str(self._rhodecode_user.username)
-
-        _def_clone_uri = _def_clone_uri_id = c.clone_uri_tmpl
-        _def_clone_uri_ssh = c.clone_uri_ssh_tmpl
-
-        if '{repo}' in _def_clone_uri:
-            _def_clone_uri_id = _def_clone_uri.replace(
-                '{repo}', '_{repoid}')
-        elif '{repoid}' in _def_clone_uri:
-            _def_clone_uri_id = _def_clone_uri.replace(
-                '_{repoid}', '{repo}')
-
-        c.clone_repo_url = self.db_repo.clone_url(
-            user=username, uri_tmpl=_def_clone_uri)
-        c.clone_repo_url_id = self.db_repo.clone_url(
-            user=username, uri_tmpl=_def_clone_uri_id)
-        c.clone_repo_url_ssh = self.db_repo.clone_url(
-            uri_tmpl=_def_clone_uri_ssh, ssh=True)
+        self._prepare_and_set_clone_url(c)
 
         # If enabled, get statistics data
 

rhodecode/config/licenses.json

@@ -28,23 +28,16 b''
     {
         "license": [
             {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-coverage-3.7.1"
-    },
-    {
-        "license": [
-            {
                 "fullName": "MIT License",
                 "shortName": "mit",
                 "spdxId": "MIT",
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
+        "name": "python2.7-beautifulsoup4-4.6.3"
+    },
+    {
+        "license": "UNKNOWN",
         "name": "python2.7-bootstrapped-pip-9.0.1"
     },
     {
@@ -56,29 +49,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-cov-core-1.15.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-webtest-2.0.29"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-beautifulsoup4-4.6.3"
+        "name": "python2.7-webtest-2.0.32"
     },
     {
         "license": [
@@ -100,7 +71,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-webob-1.7.4"
+        "name": "python2.7-webob-1.8.4"
     },
     {
         "license": [
@@ -116,6 +87,28 b''
     {
         "license": [
             {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-coverage-4.5.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-cov-core-1.15.0"
+    },
+    {
+        "license": [
+            {
                 "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
                 "shortName": "bsdOriginal",
                 "spdxId": "BSD-4-Clause",
@@ -127,6 +120,17 b''
     {
         "license": [
             {
+                "fullName": "GNU Lesser General Public License v3 or later (LGPLv3+)"
+            },
+            {
+                "fullName": "LGPL"
+            }
+        ],
+        "name": "python2.7-gprof2dot-2017.9.19"
+    },
+    {
+        "license": [
+            {
                 "fullName": "MIT License",
                 "shortName": "mit",
                 "spdxId": "MIT",
@@ -136,7 +140,7 b''
                 "fullName": "DFSG approved"
             }
         ],
-        "name": "python2.7-pytest-timeout-1.2.1"
+        "name": "python2.7-pytest-timeout-1.3.2"
     },
     {
         "license": [
@@ -147,7 +151,32 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pytest-3.6.0"
+        "name": "python2.7-pytest-3.8.2"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pathlib2-2.3.3"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            },
+            {
+                "fullName": "New BSD License"
+            }
+        ],
+        "name": "python2.7-scandir-1.9.0"
     },
     {
         "license": [
@@ -172,7 +201,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pluggy-0.6.0"
+        "name": "python2.7-pluggy-0.9.0"
     },
     {
         "license": [
@@ -183,7 +212,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-atomicwrites-1.1.5"
+        "name": "python2.7-atomicwrites-1.2.1"
     },
     {
         "license": [
@@ -194,7 +223,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-more-itertools-4.3.0"
+        "name": "python2.7-more-itertools-5.0.0"
     },
     {
         "license": [
@@ -205,7 +234,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-attrs-18.1.0"
+        "name": "python2.7-attrs-18.2.0"
     },
     {
         "license": [
@@ -216,18 +245,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-py-1.5.3"
-    },
-    {
-        "license": [
-            {
-                "fullName": "GNU Lesser General Public License v3 or later (LGPLv3+)"
-            },
-            {
-                "fullName": "LGPL"
-            }
-        ],
-        "name": "python2.7-gprof2dot-2017.9.19"
+        "name": "python2.7-py-1.6.0"
     },
     {
         "license": [
@@ -299,7 +317,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pytest-cov-2.5.1"
+        "name": "python2.7-pytest-cov-2.6.0"
     },
     {
         "license": [
@@ -310,7 +328,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-appenlight-client-0.6.25"
+        "name": "python2.7-appenlight-client-0.6.26"
     },
     {
         "license": [
@@ -326,10 +344,107 b''
     {
         "license": [
             {
-                "fullName": "AGPLv3 and Proprietary"
+                "fullName": "Apache 2.0 and Proprietary"
+            }
+        ],
+        "name": "python2.7-rhodecode-tools-1.2.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch1-dsl-0.0.12"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch1-1.10.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-rhodecode-tools-0.16.0"
+        "name": "python2.7-urllib3-1.24.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            },
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            },
+            {
+                "fullName": "Dual License"
+            }
+        ],
+        "name": "python2.7-python-dateutil-2.8.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch2-2.5.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch-dsl-6.3.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Python Software Foundation License version 2",
+                "shortName": "psfl",
+                "spdxId": "Python-2.0",
+                "url": "http://spdx.org/licenses/Python-2.0.html"
+            }
+        ],
+        "name": "python2.7-ipaddress-1.0.22"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch-6.3.1"
     },
     {
         "license": [
@@ -351,66 +466,13 b''
     {
         "license": [
             {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-urllib3-1.21"
-    },
-    {
-        "license": [
-            {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            }
-        ],
-        "name": "python2.7-elasticsearch-dsl-2.2.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            }
-        ],
-        "name": "python2.7-elasticsearch-2.3.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            },
-            {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            },
-            {
-                "fullName": "Dual License"
-            }
-        ],
-        "name": "python2.7-python-dateutil-2.7.3"
-    },
-    {
-        "license": [
-            {
                 "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
                 "shortName": "bsdOriginal",
                 "spdxId": "BSD-4-Clause",
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-markupsafe-1.0"
+        "name": "python2.7-markupsafe-1.1.0"
     },
     {
         "license": [
@@ -443,29 +505,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-click-6.6"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-bottle-0.12.13"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-cprofilev-1.0.7"
+        "name": "python2.7-click-7.0"
     },
     {
         "license": [
@@ -519,31 +559,6 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pathlib2-2.3.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            },
-            {
-                "fullName": "New BSD License"
-            }
-        ],
-        "name": "python2.7-scandir-1.9.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
         "name": "python2.7-backports.shutil-get-terminal-size-1.0.0"
     },
     {
@@ -555,7 +570,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-pygments-2.2.0"
+        "name": "python2.7-pygments-2.3.1"
     },
     {
         "license": [
@@ -646,7 +661,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pickleshare-0.7.4"
+        "name": "python2.7-pickleshare-0.7.5"
     },
     {
         "license": [
@@ -690,7 +705,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-greenlet-0.4.13"
+        "name": "python2.7-greenlet-0.4.15"
     },
     {
         "license": [
@@ -701,7 +716,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-gevent-1.3.5"
+        "name": "python2.7-gevent-1.4.0"
     },
     {
         "license": [
@@ -712,7 +727,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-psutil-5.4.6"
+        "name": "python2.7-psutil-5.5.1"
     },
     {
         "license": [
@@ -745,7 +760,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-alembic-0.9.9"
+        "name": "python2.7-alembic-1.0.5"
     },
     {
         "license": {
@@ -754,7 +769,7 b''
             "spdxId": "Apache-2.0",
             "url": "http://spdx.org/licenses/Apache-2.0.html"
         },
-        "name": "python2.7-python-editor-1.0.3"
+        "name": "python2.7-python-editor-1.0.4"
     },
     {
         "license": [
@@ -842,39 +857,6 b''
     {
         "license": [
             {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            }
-        ],
-        "name": "python2.7-bleach-2.1.4"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-html5lib-1.0.1"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-webencodings-0.5.1"
-    },
-    {
-        "license": [
-            {
                 "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
                 "shortName": "bsdOriginal",
                 "spdxId": "BSD-4-Clause",
@@ -892,7 +874,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-testpath-0.3.1"
+        "name": "python2.7-testpath-0.4.2"
     },
     {
         "license": [
@@ -908,6 +890,28 b''
     {
         "license": [
             {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-bleach-3.1.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-webencodings-0.5.1"
+    },
+    {
+        "license": [
+            {
                 "fullName": "MIT License",
                 "shortName": "mit",
                 "spdxId": "MIT",
@@ -925,7 +929,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-configparser-3.5.0"
+        "name": "python2.7-configparser-3.7.3"
     },
     {
         "license": [
@@ -947,7 +951,73 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-mistune-0.8.3"
+        "name": "python2.7-mistune-0.8.4"
+    },
+    {
+        "license": {
+            "fullName": "GNU Lesser General Public License v3.0 or later",
+            "shortName": "lgpl3Plus",
+            "spdxId": "LGPL-3.0+",
+            "url": "http://spdx.org/licenses/LGPL-3.0+.html"
+        },
+        "name": "python2.7-psycopg2-2.7.7"
+    },
+    {
+        "license": {
+            "fullName": "PostgreSQL License",
+            "shortName": "postgresql",
+            "spdxId": "PostgreSQL",
+            "url": "http://spdx.org/licenses/PostgreSQL.html"
+        },
+        "name": "postgresql-9.6.10"
+    },
+    {
+        "license": [
+            {
+                "fullName": "zlib License",
+                "shortName": "zlib",
+                "spdxId": "Zlib",
+                "url": "http://spdx.org/licenses/Zlib.html"
+            },
+            {
+                "fullName": "libpng License",
+                "shortName": "libpng",
+                "spdxId": "Libpng",
+                "url": "http://spdx.org/licenses/Libpng.html"
+            }
+        ],
+        "name": "python2.7-pysqlite-2.8.3"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pymysql-0.8.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "GNU General Public License v1.0 only",
+                "shortName": "gpl1",
+                "spdxId": "GPL-1.0",
+                "url": "http://spdx.org/licenses/GPL-1.0.html"
+            }
+        ],
+        "name": "python2.7-mysql-python-1.2.5"
+    },
+    {
+        "license": {
+            "fullName": "GNU Library General Public License v2.1 only",
+            "shortName": "lgpl21",
+            "spdxId": "LGPL-2.1",
+            "url": "http://spdx.org/licenses/LGPL-2.1.html"
+        },
+        "name": "mariadb-connector-c-2.3.4"
     },
     {
         "license": [
@@ -958,7 +1028,7 b''
                 "url": "http://spdx.org/licenses/ZPL-2.1.html"
             }
         ],
-        "name": "python2.7-zope.interface-4.5.0"
+        "name": "python2.7-zope.interface-4.6.0"
     },
     {
         "license": [
@@ -969,7 +1039,7 b''
                 "url": "http://spdx.org/licenses/ZPL-2.1.html"
             }
         ],
-        "name": "python2.7-zope.event-4.3.0"
+        "name": "python2.7-zope.event-4.4"
     },
     {
         "license": [
@@ -980,7 +1050,7 b''
                 "url": "http://spdx.org/licenses/ZPL-2.1.html"
             }
         ],
-        "name": "python2.7-zope.deprecation-4.3.0"
+        "name": "python2.7-zope.deprecation-4.4.0"
     },
     {
         "license": [
@@ -1043,7 +1113,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-paste-2.0.3"
+        "name": "python2.7-paste-3.0.5"
     },
     {
         "license": [
@@ -1061,7 +1131,7 b''
             "fullName": "Repoze License",
             "url": "http://www.repoze.org/LICENSE.txt"
         },
-        "name": "python2.7-venusian-1.1.0"
+        "name": "python2.7-venusian-1.2.0"
     },
     {
         "license": {
@@ -1072,17 +1142,6 b''
         "name": "python2.7-urlobject-2.4.3"
     },
     {
-        "license": [
-            {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            }
-        ],
-        "name": "python2.7-trollius-1.0.4"
-    },
-    {
         "license": {
             "fullName": "Repoze License",
             "url": "http://www.repoze.org/LICENSE.txt"
@@ -1095,7 +1154,7 b''
                 "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
             }
         ],
-        "name": "python2.7-supervisor-3.3.4"
+        "name": "python2.7-supervisor-3.3.5"
     },
     {
         "license": [
@@ -1114,7 +1173,7 b''
                 "url": "http://spdx.org/licenses/Python-2.0.html"
             }
         ],
-        "name": "python2.7-subprocess32-3.5.1"
+        "name": "python2.7-subprocess32-3.5.3"
     },
     {
         "license": [
@@ -1125,7 +1184,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-sshpubkeys-2.2.0"
+        "name": "python2.7-sshpubkeys-3.1.0"
     },
     {
         "license": [
@@ -1141,16 +1200,33 b''
     {
         "license": [
             {
-                "fullName": "Academic Free License (AFL)"
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            },
+            {
+                "fullName": "BSD or Apache License, Version 2.0"
             },
             {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-cryptography-2.5"
+    },
+    {
+        "license": [
+            {
                 "fullName": "MIT License",
                 "shortName": "mit",
                 "spdxId": "MIT",
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-simplejson-3.11.1"
+        "name": "python2.7-cffi-1.12.1"
     },
     {
         "license": [
@@ -1161,7 +1237,32 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-setproctitle-1.1.10"
+        "name": "python2.7-pycparser-2.19"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-asn1crypto-0.24.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Academic Free License (AFL)"
+            },
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-simplejson-3.16.0"
     },
     {
         "license": [
@@ -1201,7 +1302,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-py-gfm-0.1.3"
+        "name": "python2.7-py-gfm-0.1.4"
     },
     {
         "license": [
@@ -1239,6 +1340,72 b''
     {
         "license": [
             {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-python-saml-2.4.2"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Python Software Foundation License version 2",
+                "shortName": "psfl",
+                "spdxId": "Python-2.0",
+                "url": "http://spdx.org/licenses/Python-2.0.html"
+            }
+        ],
+        "name": "python2.7-defusedxml-0.5.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-isodate-0.6.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-dm.xmlsec.binding-1.3.7"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-lxml-4.2.5"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-wheel-0.30.0"
+    },
+    {
+        "license": [
+            {
                 "fullName": "License :: OSI Approved :: MIT License"
             },
             {
@@ -1251,14 +1418,7 b''
         "name": "python2.7-python-pam-1.8.4"
     },
     {
-        "license": [
-            {
-                "fullName": "GNU General Public License v1.0 only",
-                "shortName": "gpl1",
-                "spdxId": "GPL-1.0",
-                "url": "http://spdx.org/licenses/GPL-1.0.html"
-            }
-        ],
+        "license": "UNKNOWN",
         "name": "linux-pam-1.3.0"
     },
     {
@@ -1293,9 +1453,7 b''
         "name": "libkrb5-1.15.2"
     },
     {
-        "license":{
-            "fullName": "BSD-derived (https://www.openldap.org/software/release/license.html)"
-        },
+        "license": "UNKNOWN",
         "name": "openldap-2.4.45"
     },
     {
@@ -1307,7 +1465,18 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-pyasn1-modules-0.2.2"
+        "name": "python2.7-pyasn1-modules-0.2.4"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-pyasn1-0.4.5"
     },
     {
         "license": [
@@ -1318,42 +1487,36 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-pyasn1-0.4.4"
+        "name": "python2.7-pyramid-mailer-0.15.1"
     },
     {
         "license": [
             {
-                "fullName": "zlib License",
-                "shortName": "zlib",
-                "spdxId": "Zlib",
-                "url": "http://spdx.org/licenses/Zlib.html"
-            },
-            {
-                "fullName": "libpng License",
-                "shortName": "libpng",
-                "spdxId": "Libpng",
-                "url": "http://spdx.org/licenses/Libpng.html"
+                "fullName": "Zope Public License 2.1",
+                "shortName": "zpl21",
+                "spdxId": "ZPL-2.1",
+                "url": "http://spdx.org/licenses/ZPL-2.1.html"
             }
         ],
-        "name": "python2.7-pysqlite-2.8.3"
+        "name": "python2.7-transaction-2.4.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Zope Public License 2.1",
+                "shortName": "zpl21",
+                "spdxId": "ZPL-2.1",
+                "url": "http://spdx.org/licenses/ZPL-2.1.html"
+            }
+        ],
+        "name": "python2.7-repoze.sendmail-4.4.1"
     },
     {
         "license": {
             "fullName": "Repoze License",
             "url": "http://www.repoze.org/LICENSE.txt"
         },
-        "name": "python2.7-pyramid-1.9.2"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-hupper-1.3"
+        "name": "python2.7-pyramid-1.10.1"
     },
     {
         "license": [
@@ -1386,7 +1549,18 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pastedeploy-1.5.2"
+        "name": "python2.7-pastedeploy-2.0.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-hupper-1.5"
     },
     {
         "license": {
@@ -1419,18 +1593,7 b''
                 "url": "http://www.repoze.org/LICENSE.txt"
             }
         ],
-        "name": "python2.7-pyramid-debugtoolbar-4.4"
-    },
-    {
-        "license": [
-            {
-                "fullName": "Python Software Foundation License version 2",
-                "shortName": "psfl",
-                "spdxId": "Python-2.0",
-                "url": "http://spdx.org/licenses/Python-2.0.html"
-            }
-        ],
-        "name": "python2.7-ipaddress-1.0.22"
+        "name": "python2.7-pyramid-debugtoolbar-4.5"
     },
     {
         "license": {
@@ -1459,18 +1622,16 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pyparsing-1.5.7"
+        "name": "python2.7-pyparsing-2.3.0"
     },
     {
         "license": [
             {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
+                "fullName": "Public Domain",
+                "shortName": "publicDomain"
             }
         ],
-        "name": "python2.7-pygments-markdown-lexer-0.1.0.dev39"
+        "name": "python2.7-pycrypto-2.6.1"
     },
     {
         "license": {
@@ -1493,30 +1654,12 b''
         "name": "python2.7-py-bcrypt-0.4"
     },
     {
-        "license": {
-            "fullName": "GNU Lesser General Public License v3.0 or later",
-            "shortName": "lgpl3Plus",
-            "spdxId": "LGPL-3.0+",
-            "url": "http://spdx.org/licenses/LGPL-3.0+.html"
-        },
-        "name": "python2.7-psycopg2-2.7.4"
-    },
-    {
-        "license": {
-            "fullName": "PostgreSQL License",
-            "shortName": "postgresql",
-            "spdxId": "PostgreSQL",
-            "url": "http://spdx.org/licenses/PostgreSQL.html"
-        },
-        "name": "postgresql-9.6.10"
-    },
-    {
         "license": [
             {
                 "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
             }
         ],
-        "name": "python2.7-peppercorn-0.5"
+        "name": "python2.7-peppercorn-0.6"
     },
     {
         "license": [
@@ -1527,7 +1670,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pastescript-2.0.2"
+        "name": "python2.7-pastescript-3.0.0"
     },
     {
         "license": [
@@ -1549,60 +1692,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-objgraph-3.1.1"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-graphviz-0.9"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-pyotp-2.2.6"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-pymysql-0.8.1"
-    },
-    {
-        "license": [
-            {
-                "fullName": "GNU General Public License v1.0 only",
-                "shortName": "gpl1",
-                "spdxId": "GPL-1.0",
-                "url": "http://spdx.org/licenses/GPL-1.0.html"
-            }
-        ],
-        "name": "python2.7-mysql-python-1.2.5"
-    },
-    {
-        "license": {
-            "fullName": "GNU Library General Public License v2.1 only",
-            "shortName": "lgpl21",
-            "spdxId": "LGPL-2.1",
-            "url": "http://spdx.org/licenses/LGPL-2.1.html"
-        },
-        "name": "mariadb-connector-c-2.3.4"
+        "name": "python2.7-pyotp-2.2.7"
     },
     {
         "license": [
@@ -1624,29 +1714,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-lxml-3.7.3"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-wheel-0.30.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-kombu-4.2.0"
+        "name": "python2.7-kombu-4.2.1"
     },
     {
         "license": [
@@ -1668,18 +1736,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-vine-1.1.4"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-billiard-3.5.0.3"
+        "name": "python2.7-vine-1.2.0"
     },
     {
         "license": [
@@ -1701,7 +1758,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-iso8601-0.1.11"
+        "name": "python2.7-iso8601-0.1.12"
     },
     {
         "license": [
@@ -1745,7 +1802,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-dogpile.cache-0.6.6"
+        "name": "python2.7-dogpile.cache-0.7.1"
     },
     {
         "license": {
@@ -1759,17 +1816,20 b''
     {
         "license": [
             {
+                "fullName": "Repoze Public License"
+            },
+            {
                 "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
             }
         ],
-        "name": "python2.7-deform-2.0.5"
+        "name": "python2.7-deform-2.0.7"
     },
     {
         "license": {
             "fullName": "Repoze License",
             "url": "http://www.repoze.org/LICENSE.txt"
         },
-        "name": "python2.7-colander-1.4"
+        "name": "python2.7-colander-1.7.0"
     },
     {
         "license": [
@@ -1843,6 +1903,17 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
+        "name": "python2.7-billiard-3.5.0.3"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
         "name": "python2.7-babel-1.3"
     },
     {
@@ -1857,25 +1928,7 b''
         "name": "python2.7-authomatic-0.1.0.post1"
     },
     {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "node-grunt-cli-1.2.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
+        "license": "UNKNOWN",
         "name": "python2.7-rhodecode-testdata-0.10.0"
     }
 ]

rhodecode/lib/bleach_whitelist.py

@@ -70,7 +70,7 b' markdown_attrs = {'
     "abbr": ["title"],
     "acronym": ["title"],
     "pre": ["lang"],
-    "input": ["type", "disabled"]
+    "input": ["type", "disabled", "checked"]
 }
 
 standard_styles = [

rhodecode/lib/helpers.py

@@ -2037,6 +2037,6 b' def get_repo_view_type(request):'
         'repo_files': 'files',
         'repo_summary': 'summary',
         'repo_commit': 'commit'
+    }
 
-    }
     return route_to_view_type.get(route_name)

rhodecode/lib/hooks_base.py

@@ -270,7 +270,7 b' def post_push(extras):'
     # make lock is a tri state False, True, None. We only release lock on False
     if extras.make_lock is False and not is_shadow_repo(extras):
         Repository.unlock(Repository.get_by_repo_name(extras.repository))
-        msg = 'Released lock on repo `%s`\n' % extras.repository
+        msg = 'Released lock on repo `{}`\n'.format(safe_str(extras.repository))
         output += msg
 
     if extras.locked_by[0]:
@@ -284,8 +284,8 b' def post_push(extras):'
             output += _http_ret.title
 
     if extras.new_refs:
-        tmpl = extras.server_url + '/' + extras.repository + \
-               "/pull-request/new?{ref_type}={ref_name}"
+        tmpl = '{}/{}/pull-request/new?{{ref_type}}={{ref_name}}'.format(
+            safe_str(extras.server_url), safe_str(extras.repository))
 
         for branch_name in extras.new_refs['branches']:
             output += 'RhodeCode: open pull request link: {}\n'.format(

rhodecode/lib/index/__init__.py

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

rhodecode/lib/markdown_ext.py

@@ -18,26 +18,11 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-import re
-
 import markdown
 
 from mdx_gfm import GithubFlavoredMarkdownExtension  # pragma: no cover
 
 
-class FlavoredCheckboxPostprocessor(markdown.postprocessors.Postprocessor):
-    """
-    Adds `flavored_checkbox_list` class to list of checkboxes
-    """
-
-    pattern = re.compile(r'^([*-]) \[([ x])\]')
-
-    def run(self, html):
-        before = '<ul>\n<li><input type="checkbox"'
-        after = '<ul class="flavored_checkbox_list">\n<li><input type="checkbox"'
-        return html.replace(before, after)
-
-
 # Global Vars
 URLIZE_RE = '(%s)' % '|'.join([
     r'<(?:f|ht)tps?://[^>]*>',

rhodecode/lib/paster_commands/upgrade_db.py

@@ -26,7 +26,8 b' log = logging.getLogger(__name__)'
 
 
 class UpgradeDb(BasePasterCommand):
-    """Command used for paster to upgrade our database to newer version
+    """
+    Command used for paster to upgrade our database to newer version
     """
 
     max_args = 1
@@ -41,7 +42,7 b' class UpgradeDb(BasePasterCommand):'
     def command(self):
         from rhodecode.lib.rc_commands import upgrade_db
         upgrade_db.command(
-            self.path_to_ini_file, self.options.__dict__.get('force_ask'))
+            self.path_to_ini_file, self.options.__dict__.get('force_ask'), None)
 
     def update_parser(self):
         self.parser.add_option('--sql',

rhodecode/lib/user_sessions.py

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

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

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

rhodecode/model/comment.py

@@ -259,8 +259,18 b' class CommentsModel(BaseModel):'
         # check if the comment actually belongs to this PR
         if resolved_comment and resolved_comment.pull_request and \
                 resolved_comment.pull_request != pull_request:
+            log.warning('Comment tried to resolved unrelated todo comment: %s',
+                        resolved_comment)
             # comment not bound to this pull request, forbid
             resolved_comment = None
+
+        elif resolved_comment and resolved_comment.repo and \
+                resolved_comment.repo != repo:
+            log.warning('Comment tried to resolved unrelated todo comment: %s',
+                        resolved_comment)
+            # comment not bound to this repo, forbid
+            resolved_comment = None
+
         comment.resolved_comment = resolved_comment
 
         pull_request_id = pull_request

rhodecode/model/db.py

@@ -39,7 +39,7 b' from sqlalchemy import ('
     Index, Sequence, UniqueConstraint, ForeignKey, CheckConstraint, Column,
     Boolean, String, Unicode, UnicodeText, DateTime, Integer, LargeBinary,
     Text, Float, PickleType)
-from sqlalchemy.sql.expression import true, false
+from sqlalchemy.sql.expression import true, false, case
 from sqlalchemy.sql.functions import coalesce, count  # pragma: no cover
 from sqlalchemy.orm import (
     relationship, joinedload, class_mapper, validates, aliased)
@@ -4260,9 +4260,16 b' class Gist(Base, BaseModel):'
     # SCM functions
 
     def scm_instance(self, **kwargs):
+        """
+        Get explicit Mercurial repository used
+        :param kwargs:
+        :return:
+        """
+        from rhodecode.model.gist import GistModel
         full_repo_path = os.path.join(self.base_path(), self.gist_access_id)
         return get_vcs_instance(
-            repo_path=safe_str(full_repo_path), create=False)
+            repo_path=safe_str(full_repo_path), create=False,
+            _vcs_alias=GistModel.vcs_backend)
 
 
 class ExternalIdentity(Base, BaseModel):

rhodecode/model/gist.py

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

rhodecode/model/pull_request.py

@@ -1303,10 +1303,13 b' class PullRequestModel(BaseModel):'
             merge_state = self._refresh_merge_state(
                 pull_request, target_vcs, target_ref)
         else:
-            possible = pull_request.\
-                last_merge_status == MergeFailureReason.NONE
+            possible = pull_request.last_merge_status == MergeFailureReason.NONE
+            metadata = {
+                'target_ref': pull_request.target_ref_parts,
+                'source_ref': pull_request.source_ref_parts
+            }
             merge_state = MergeResponse(
-                possible, False, None, pull_request.last_merge_status)
+                possible, False, None, pull_request.last_merge_status, metadata=metadata)
 
         return merge_state
 
@@ -1420,8 +1423,8 b' class PullRequestModel(BaseModel):'
         _ = translator or get_current_request().translate
 
         commit_id = safe_str(commit_id) if commit_id else None
-        branch = safe_str(branch) if branch else None
-        bookmark = safe_str(bookmark) if bookmark else None
+        branch = safe_unicode(branch) if branch else None
+        bookmark = safe_unicode(bookmark) if bookmark else None
 
         selected = None
 
@@ -1439,10 +1442,11 b' class PullRequestModel(BaseModel):'
         )
 
         groups = []
+
         for group_key, ref_list, group_name, match in sources:
             group_refs = []
             for ref_name, ref_id in ref_list:
-                ref_key = '%s:%s:%s' % (group_key, ref_name, ref_id)
+                ref_key = u'{}:{}:{}'.format(group_key, ref_name, ref_id)
                 group_refs.append((ref_key, ref_name))
 
                 if not selected:
@@ -1456,11 +1460,11 b' class PullRequestModel(BaseModel):'
             ref = commit_id or branch or bookmark
             if ref:
                 raise CommitDoesNotExistError(
-                    'No commit refs could be found matching: %s' % ref)
+                    u'No commit refs could be found matching: {}'.format(ref))
             elif repo.DEFAULT_BRANCH_NAME in repo.branches:
-                selected = 'branch:%s:%s' % (
-                    repo.DEFAULT_BRANCH_NAME,
-                    repo.branches[repo.DEFAULT_BRANCH_NAME]
+                selected = u'branch:{}:{}'.format(
+                    safe_unicode(repo.DEFAULT_BRANCH_NAME),
+                    safe_unicode(repo.branches[repo.DEFAULT_BRANCH_NAME])
                 )
             elif repo.commit_ids:
                 # make the user select in this case

rhodecode/model/repo_group.py

@@ -728,6 +728,10 b' class RepoGroupModel(BaseModel):'
                 "name_raw": group.group_name,
                 "last_change": last_change(group.last_db_change),
                 "last_change_raw": datetime_to_time(group.last_db_change),
+
+                "last_changeset": "",
+                "last_changeset_raw": "",
+
                 "desc": desc(group.description_safe, group.personal),
                 "top_level_repos": 0,
                 "owner": user_profile(group.user.username)

rhodecode/public/css/main.less

@@ -1024,11 +1024,15 b' label {'
 	float:left;
 }
 
-.branding{
+.branding {
 	float: left;
 	padding: 9px 2px;
 	line-height: 1em;
 	font-size: @navigation-fontsize;
+
+    a {
+      color: @grey5
+    }
 }
 
 img {

rhodecode/public/css/navigation.less

@@ -92,6 +92,10 b''
             }
         }
 
+        &.active {
+            border-bottom: 5px solid @rcblue;
+        }
+
         &.open {
 
             a {
@@ -133,6 +137,7 b''
             padding: 0 0 0.4em 0;
             line-height: 1em;
             // for this specifically we do not use a variable
+            border-right: 1px solid @grey4;
         }
 
         .pr_notifications {
@@ -651,6 +656,40 b' ul#context-pages {'
 
 .main_filter_input_box {
     display: inline-block;
+
+    .searchItems {
+        display:flex;
+        background: #666666;
+        padding: 0px;
+
+        a {
+            border: none !important;
+        }
+    }
+
+    .searchTag {
+        line-height: 28px;
+        padding: 0px 4px;
+
+        .tag {
+            color: @nav-grey;
+            border-color: @nav-grey;
+        }
+    }
+
+    .searchTagFilter {
+        background-color: @grey3 !important;
+    }
+
+    .searchTagHelp {
+        background-color: @grey2 !important;
+    }
+    .searchTagHelp:hover {
+        background-color: @grey2 !important;
+    }
+    .searchTagInput {
+        background-color: @grey3 !important;
+    }
 }
 
 .main_filter_box {

rhodecode/public/css/tables.less

@@ -141,6 +141,11 b' table.dataTable {'
             }
         }
 
+        &.td-grid-name {
+            white-space: nowrap;
+            min-width: 300px;
+        }
+
         &.td-componentname {
             white-space: nowrap;
         }

rhodecode/public/js/src/plugins/jquery.autocomplete.js

@@ -528,7 +528,19 b''
                 if ($.isFunction(serviceUrl)) {
                     serviceUrl = serviceUrl.call(that.element, query);
                 }
-                cacheKey = serviceUrl + '?' + $.param(params || {});
+
+                var callParams = {};
+                //make an evaluated copy of params
+                $.each(params, function(index, value) {
+                    if($.isFunction(value)){
+                        callParams[index] = value();
+                    }
+                    else {
+                        callParams[index] = value;
+                    }
+                });
+
+                cacheKey = serviceUrl + '?' + $.param(callParams);
                 response = that.cachedResponse[cacheKey];
             }
 
@@ -536,7 +548,7 b''
                 that.suggestions = response.suggestions;
                 that.suggest();
             } else if (!that.isBadQuery(query)) {
-                if (options.onSearchStart.call(that.element, options.params) === false) {
+                if (options.onSearchStart.call(that.element, params) === false) {
                     return;
                 }
                 if (that.currentRequest) {

rhodecode/templates/base/base.mako

@@ -9,11 +9,13 b''
       <div id="header-inner" class="wrapper">
           <div id="logo">
               <div class="logo-wrapper">
-                  <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                  <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-60x60.png')}" alt="RhodeCode"/></a>
               </div>
-              %if c.rhodecode_name:
-               <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
-              %endif
+              % if c.rhodecode_name:
+               <div class="branding">
+                   <a href="${h.route_path('home')}">${h.branding(c.rhodecode_name)}</a>
+               </div>
+              % endif
           </div>
           <!-- MENU BAR NAV -->
           ${self.menu_bar_nav()}
@@ -236,7 +238,6 b''
         <li class="${is_active('changelog')}"><a class="menulink" href="${h.route_path('repo_changelog', repo_name=c.repo_name)}"><div class="menulabel">${_('Changelog')}</div></a></li>
         <li class="${is_active('files')}"><a class="menulink" href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.rhodecode_db_repo.landing_rev[1], f_path='')}"><div class="menulabel">${_('Files')}</div></a></li>
         <li class="${is_active('compare')}"><a class="menulink" href="${h.route_path('repo_compare_select',repo_name=c.repo_name)}"><div class="menulabel">${_('Compare')}</div></a></li>
-        <li class="${is_active('search')}"><a class="menulink" href="${h.route_path('search_repo',repo_name=c.repo_name)}"><div class="menulabel">${_('Search')}</div></a></li>
 
         ## TODO: anderson: ideally it would have a function on the scm_instance "enable_pullrequest() and enable_fork()"
         %if c.rhodecode_db_repo.repo_type in ['git','hg']:
@@ -341,7 +342,6 b''
     <div class="wrapper">
       <ul id="context-pages" class="navigation horizontal-list">
         <li class="${is_active('home')}"><a class="menulink" href="${h.route_path('repo_group_home', repo_group_name=c.repo_group.group_name)}"><div class="menulabel">${_('Group Home')}</div></a></li>
-        <li class="${is_active('search')}"><a class="menulink" href="${h.route_path('search_repo_group', repo_group_name=c.repo_group.group_name)}"><div class="menulabel">${_('Search')}</div></a></li>
 
         <li class="${is_active('options')}">
           <a class="menulink dropdown">
@@ -489,10 +489,35 b''
        <li>
         <div class="menulabel main_filter_box">
             <div class="main_filter_input_box">
-                <input class="main_filter_input" id="main_filter" size="15" type="text" name="main_filter" placeholder="${_('search / go to...')}" value=""/>
-            </div>
-            <div class="main_filter_help_box">
-                <a href="#showFilterHelp" onclick="showMainFilterBox(); return false">?</a>
+                <ul class="searchItems">
+
+                    % if c.template_context['search_context']['repo_id']:
+                        <li class="searchTag searchTagFilter searchTagHidable" >
+                        ##<a href="${h.route_path('search_repo',repo_name=c.template_context['search_context']['repo_name'])}">
+                            <span class="tag">
+                                This repo
+                                <a href="#removeGoToFilter" onclick="removeGoToFilter(); return false"><i class="icon-delete"></i></a>
+                            </span>
+                        ##</a>
+                        </li>
+                    % elif c.template_context['search_context']['repo_group_id']:
+                        <li class="searchTag searchTagFilter searchTagHidable">
+                        ##<a href="${h.route_path('search_repo_group',repo_group_name=c.template_context['search_context']['repo_group_name'])}">
+                            <span class="tag">
+                                This group
+                                <a href="#removeGoToFilter" onclick="removeGoToFilter(); return false"><i class="icon-delete"></i></a>
+                            </span>
+                        ##</a>
+                        </li>
+                    % endif
+
+                    <li class="searchTagInput">
+                        <input class="main_filter_input" id="main_filter" size="15" type="text" name="main_filter" placeholder="${_('search / go to...')}" value="" />
+                    </li>
+                    <li class="searchTag searchTagHelp">
+                        <a href="#showFilterHelp" onclick="showMainFilterBox(); return false">?</a>
+                    </li>
+                </ul>
             </div>
         </div>
 
@@ -503,15 +528,31 b''
 
 - Prefix query to allow special search:
 
-   user:admin, to search for usernames
+   user:admin, to search for usernames, always global
+
+   user_group:devops, to search for user groups, always global
+
+   commit:efced4, to search for commits, scoped to repositories or groups
+
+   file:models.py, to search for file paths, scoped to repositories or groups
 
-   user_group:devops, to search for user groups
-
-   commit:efced4, to search for commits
+% if c.template_context['search_context']['repo_id']:
+   For advanced full text search visit: <a href="${h.route_path('search_repo',repo_name=c.template_context['search_context']['repo_name'])}">repository search</a>
+% elif c.template_context['search_context']['repo_group_id']:
+   For advanced full text search visit: <a href="${h.route_path('search_repo_group',repo_group_name=c.template_context['search_context']['repo_group_name'])}">repository group search</a>
+% else:
+   For advanced full text search visit: <a href="${h.route_path('search')}">global search</a>
+% endif
         </div>
        </li>
 
       ## ROOT MENU
+        <li class="${is_active('home')}">
+          <a class="menulink" title="${_('Home')}" href="${h.route_path('home')}">
+            <div class="menulabel">${_('Home')}</div>
+          </a>
+        </li>
+
       %if c.rhodecode_user.username != h.DEFAULT_USER:
         <li class="${is_active('journal')}">
           <a class="menulink" title="${_('Show activity journal')}" href="${h.route_path('journal')}">
@@ -525,16 +566,13 b''
           </a>
         </li>
       %endif
+
         <li class="${is_active('gists')}">
           <a class="menulink childs" title="${_('Show Gists')}" href="${h.route_path('gists_show')}">
             <div class="menulabel">${_('Gists')}</div>
           </a>
         </li>
-      <li class="${is_active('search')}">
-          <a class="menulink" title="${_('Search in repositories you have access to')}" href="${h.route_path('search')}">
-            <div class="menulabel">${_('Search')}</div>
-          </a>
-      </li>
+
       % if h.HasPermissionAll('hg.admin')('access admin main page'):
         <li class="${is_active('admin')}">
           <a class="menulink childs" title="${_('Admin settings')}" href="#" onclick="return false;">
@@ -620,6 +658,22 b''
             }(result, escapeMarkup);
         };
 
+        var escapeRegExChars = function (value) {
+            return value.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+        };
+
+        var getRepoIcon = function(repo_type) {
+            if (repo_type === 'hg') {
+                return '<i class="icon-hg"></i> ';
+            }
+            else if (repo_type === 'git') {
+                return '<i class="icon-git"></i> ';
+            }
+            else if (repo_type === 'svn') {
+                return '<i class="icon-svn"></i> ';
+            }
+            return ''
+        };
 
         var autocompleteMainFilterFormatResult = function (data, value, org_formatter) {
 
@@ -630,27 +684,14 b''
             var searchType = data['type'];
             var valueDisplay = data['value_display'];
 
-            var escapeRegExChars = function (value) {
-                return value.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-            };
             var pattern = '(' + escapeRegExChars(value) + ')';
 
-            var getRepoIcon = function(repo_type) {
-                if (repo_type === 'hg') {
-                    return '<i class="icon-hg"></i> ';
-                }
-                else if (repo_type === 'git') {
-                    return '<i class="icon-git"></i> ';
-                }
-                else if (repo_type === 'svn') {
-                    return '<i class="icon-svn"></i> ';
-                }
-                return ''
-            };
+            valueDisplay = Select2.util.escapeMarkup(valueDisplay);
 
             // highlight match
-            valueDisplay = Select2.util.escapeMarkup(valueDisplay);
-            valueDisplay = valueDisplay.replace(new RegExp(pattern, 'gi'), '<strong>$1<\/strong>');
+            if (searchType != 'text') {
+                valueDisplay = valueDisplay.replace(new RegExp(pattern, 'gi'), '<strong>$1<\/strong>');
+            }
 
             var icon = '';
 
@@ -682,6 +723,7 b''
             else if (searchType === 'user_group') {
                 icon += '<i class="icon-group"></i> ';
             }
+            // user
             else if (searchType === 'user') {
                 icon += '<img class="gravatar" src="{0}"/>'.format(data['icon_link']);
             }
@@ -695,6 +737,20 b''
                     icon += '<i class="icon-tag"></i>';
                 }
             }
+            // file
+            else if (searchType === 'file') {
+                var repo_data = data['repo_data'];
+                var repoIcon = getRepoIcon(repo_data['repository_type']);
+                if (repoIcon) {
+                    icon += repoIcon;
+                } else {
+                    icon += '<i class="icon-tag"></i>';
+                }
+            }
+            // generic text
+            else if (searchType === 'text') {
+                icon = '';
+            }
 
             var tmpl = '<div class="ac-container-wrap">{0}{1}</div>';
             return tmpl.format(icon, valueDisplay);
@@ -704,25 +760,52 b''
             if (suggestion.type === "hint") {
                 // we skip action
                 $('#main_filter').focus();
+            }
+            else if (suggestion.type === "text") {
+                // we skip action
+                $('#main_filter').focus();
+
             } else {
               window.location = suggestion['url'];
             }
         };
+
         var autocompleteMainFilterResult = function (suggestion, originalQuery, queryLowerCase) {
             if (queryLowerCase.split(':').length === 2) {
                 queryLowerCase = queryLowerCase.split(':')[1]
             }
+            if (suggestion.type === "text") {
+                // special case we don't want to "skip" display for
+                return true
+            }
             return suggestion.value_display.toLowerCase().indexOf(queryLowerCase) !== -1;
         };
 
+        var cleanContext = {
+            repo_view_type: null,
+
+            repo_id: null,
+            repo_name: "",
+
+            repo_group_id: null,
+            repo_group_name: null
+        };
+        var removeGoToFilter = function () {
+            $('.searchTagHidable').hide();
+            $('#main_filter').autocomplete(
+                'setOptions', {params:{search_context: cleanContext}});
+        };
+
         $('#main_filter').autocomplete({
             serviceUrl: pyroutes.url('goto_switcher_data'),
-            params: {"search_context": templateContext.search_context},
+            params: {
+                "search_context": templateContext.search_context
+            },
             minChars:2,
             maxHeight:400,
             deferRequestBy: 300, //miliseconds
             tabDisabled: true,
-            autoSelectFirst: true,
+            autoSelectFirst: false,
             formatResult: autocompleteMainFilterFormatResult,
             lookupFilter: autocompleteMainFilterResult,
             onSelect: function (element, suggestion) {
@@ -741,6 +824,18 b''
             $('#main_filter_help').toggle();
         };
 
+        $('#main_filter').on('keydown.autocomplete', function (e) {
+
+            var BACKSPACE = 8;
+            var el = $(e.currentTarget);
+            if(e.which === BACKSPACE){
+                var inputVal = el.val();
+                if (inputVal === ""){
+                    removeGoToFilter()
+                }
+            }
+        });
+
     </script>
     <script src="${h.asset('js/rhodecode/base/keyboard-bindings.js', ver=c.rhodecode_version_hash)}"></script>
 </%def>

rhodecode/templates/base/root.mako

@@ -7,7 +7,7 b" go_import_header = ''"
 if hasattr(c, 'rhodecode_db_repo'):
     c.template_context['repo_type'] = c.rhodecode_db_repo.repo_type
     c.template_context['repo_landing_commit'] = c.rhodecode_db_repo.landing_rev[1]
-    ## check repo context
+    c.template_context['repo_id'] = c.rhodecode_db_repo.repo_id
     c.template_context['repo_view_type'] = h.get_repo_view_type(request)
 
 if getattr(c, 'repo_group', None):
@@ -29,6 +29,7 b" c.template_context['default_user'] = {"
 c.template_context['search_context'] = {
     'repo_group_id': c.template_context.get('repo_group_id'),
     'repo_group_name': c.template_context.get('repo_group_name'),
+    'repo_id': c.template_context.get('repo_id'),
     'repo_name': c.template_context.get('repo_name'),
     'repo_view_type': c.template_context.get('repo_view_type'),
 }

rhodecode/templates/files/files_browser.mako

@@ -30,7 +30,7 b''
             % if c.enable_downloads:
               <% at_path = '{}.zip'.format(request.GET.get('at') or c.commit.raw_id[:6]) %>
               <div title="${_('Download tree at {}').format(at_path)}" class="btn btn-default new-file">
-                <a href="${h.route_path('repo_archivefile',repo_name=c.repo_name, fname=c.commit.raw_id)}">
+                <a href="${h.route_path('repo_archivefile',repo_name=c.repo_name, fname='{}.zip'.format(c.commit.raw_id))}">
                     ${_('Download tree at {}').format(at_path)}
                 </a>
               </div>

rhodecode/templates/index_base.mako

@@ -79,13 +79,16 b''
           order: [[ 0, "asc" ]],
           columns: [
              { data: {"_": "name",
-                      "sort": "name_raw"}, title: "${_('Name')}", className: "td-componentname" },
+                      "sort": "name_raw"}, title: "${_('Name')}", className: "truncate-wrap td-grid-name" },
              { data: 'menu', "bSortable": false, className: "quick_repo_menu" },
              { data: {"_": "desc",
                       "sort": "desc"}, title: "${_('Description')}", className: "td-description" },
              { data: {"_": "last_change",
                       "sort": "last_change_raw",
                       "type": Number}, title: "${_('Last Change')}", className: "td-time" },
+             { data: {"_": "last_changeset",
+                      "sort": "last_changeset_raw",
+                      "type": Number}, title: "", className: "td-hash" },
              { data: {"_": "owner",
                       "sort": "owner"}, title: "${_('Owner')}", className: "td-user" }
           ],
@@ -109,7 +112,7 b''
           pageLength: ${c.visual.dashboard_items},
           columns: [
              { data: {"_": "name",
-                      "sort": "name_raw"}, title: "${_('Name')}", className: "truncate-wrap td-componentname" },
+                      "sort": "name_raw"}, title: "${_('Name')}", className: "truncate-wrap td-grid-name" },
              { data: 'menu', "bSortable": false, className: "quick_repo_menu" },
              { data: {"_": "desc",
                       "sort": "desc"}, title: "${_('Description')}", className: "td-description" },

rhodecode/templates/login.mako

@@ -14,11 +14,13 b''
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-60x60.png')}" alt="RhodeCode"/></a>
                 </div>
-                %if c.rhodecode_name:
-                <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
-                %endif
+                % if c.rhodecode_name:
+                <div class="branding">
+                   <a href="${h.route_path('home')}">${h.branding(c.rhodecode_name)}</a>
+                </div>
+                % endif
             </div>
         </div>
     </div>

rhodecode/templates/password_reset.mako

@@ -14,11 +14,13 b''
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-60x60.png')}" alt="RhodeCode"/></a>
                 </div>
-                %if c.rhodecode_name:
-                <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
-                %endif
+                % if c.rhodecode_name:
+                <div class="branding">
+                   <a href="${h.route_path('home')}">${h.branding(c.rhodecode_name)}</a>
+                </div>
+                % endif
             </div>
         </div>
     </div>

rhodecode/templates/pullrequests/pullrequest_merge_checks.mako

@@ -28,6 +28,9 b''
                 </span>
             </li>
         % endfor
+        <li>
+            Try <a href="${h.current_route_path(request, force_refresh=1)}">forced recheck</a> of the merge workspace in case current status seems wrong.
+        </li>
     </ul>
     % endif
 

rhodecode/templates/register.mako

@@ -14,11 +14,13 b''
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-60x60.png')}" alt="RhodeCode"/></a>
                 </div>
-                %if c.rhodecode_name:
-                <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
-                %endif
+                % if c.rhodecode_name:
+                <div class="branding">
+                   <a href="${h.route_path('home')}">${h.branding(c.rhodecode_name)}</a>
+                </div>
+                % endif
             </div>
         </div>
     </div>

rhodecode/templates/search/search.mako

@@ -37,9 +37,9 b''
 
 <%def name="menu_bar_subnav()">
     %if c.repo_name:
-        ${self.repo_menu(active='search')}
+        ${self.repo_menu(active='summary')}
     %elif c.repo_group_name:
-        ${self.repo_group_menu(active='search')}
+        ${self.repo_group_menu(active='home')}
     %endif
 </%def>
 

rhodecode/tests/vcs_operations/test_vcs_operations.py

@@ -64,8 +64,8 b' class TestVCSOperations(object):'
         clone_url = rc_web_server.repo_clone_url(HG_REPO)
         stdout, stderr = Command('/tmp').execute(
             'hg clone --pull --stream', clone_url, tmpdir.strpath)
-        assert '225 files to transfer, 1.04 MB of data' in stdout
-        assert 'transferred 1.04 MB' in stdout
+        assert 'files to transfer,' in stdout
+        assert 'transferred 1.' in stdout
         assert '114 files updated,' in stdout
 
     def test_clone_git_repo_by_admin(self, rc_web_server, tmpdir):

rhodecode/tweens.py

@@ -92,6 +92,7 b' def junk_form_data_detector(request):'
 
 def sanity_check_factory(handler, registry):
     def sanity_check(request):
+        log.debug('Checking URL sanity')
         try:
             junk_encoding_detector(request)
             bad_url_data_detector(request)
@@ -113,5 +114,5 b' def includeme(config):'
                           'pyramid.events.NewRequest')
     config.add_subscriber('rhodecode.subscribers.add_request_user_context',
                           'pyramid.events.ContextFound')
+    config.add_tween('rhodecode.tweens.vcs_detection_tween_factory')
     config.add_tween('rhodecode.tweens.sanity_check_factory')
-    config.add_tween('rhodecode.tweens.vcs_detection_tween_factory')