release: merge back stable branch into default

.hgtags

@@ -18,3 +18,4 b' 5ad13deb9118c2a5243d4032d4d9cc174e5872db'
 2be921e01fa24bb102696ada596f87464c3666f6 v4.7.0
 7198bdec29c2872c974431d55200d0398354cdb1 v4.7.1
 bd1c8d230fe741c2dfd7100a0ef39fd0774fd581 v4.7.2
+9731914f89765d9628dc4dddc84bc9402aa124c8 v4.8.0

docs/admin/nginx-config-example.rst

@@ -5,6 +5,7 b' Use the following example to configure N'
 
 
 .. code-block:: nginx
+
     ## rate limiter for certain pages to prevent brute force attacks
     limit_req_zone  $binary_remote_addr  zone=dl_limit:10m   rate=1r/s;
 

docs/api/methods/deprecated-methods.rst

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

docs/contributing/contributing.rst

@@ -19,3 +19,8 b' Welcome to the contribution guides and d'
    dev-settings
    api
    dependencies
+   checklist-tickets
+   checklist-pull-request
+   frontend
+   standards
+

docs/integrations/ci.rst

@@ -35,7 +35,7 b' call for unspecified builds.'
     A quick note on security. It's recommended to allow IP restrictions
     to only allow RhodeCode server to trigger builds. If you need to
     specify username and password this could be done by embedding it into a
-    trigger URL, e.g. `http://user:[e-mail]/job/${project_id}
+    trigger URL, e.g. `http://user:[e-mail]/job/${project_id}`
 
 
 If users require to provide any custom parameters, they can be stored for each

docs/integrations/integrations.rst

@@ -52,3 +52,4 b' See pages specific to each type of integ'
    jira
    webhook
    email
+   ci

docs/tutorials/api-examples.rst

@@ -48,14 +48,13 b' 5. Use the API to strip a commit, or num'
 
     # Check the JSON-RPC verification
 
-.. code-block:: jsonld
+.. code-block:: javascript
 
     {
       "error": null,
       "id": 5960,
       "result": {
-        "msg": "Stripped commit ad1e0523a4ab from
-            repo `repo-group/repo-name`",
+        "msg": "Stripped commit ad1e0523a4ab from repo `repo-group/repo-name`",
         "repository": "repo-group/repo-name"
       }
     }

pkgs/python-packages.nix

@@ -185,7 +185,7 b''
     };
   };
   Pylons = super.buildPythonPackage {
-    name = "Pylons-1.0.2.dev20170407";
+    name = "Pylons-1.0.2.dev20170630";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [Routes WebHelpers Beaker Paste PasteDeploy PasteScript FormEncode simplejson decorator nose Mako WebError WebTest Tempita MarkupSafe WebOb];
@@ -795,6 +795,19 b''
       license = [ { fullName = "LGPL"; } ];
     };
   };
+  graphviz = super.buildPythonPackage {
+    name = "graphviz-0.7.1";
+    buildInputs = with self; [];
+    doCheck = false;
+    propagatedBuildInputs = with self; [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/7d/2d/f5cfa56467ca5a65eb44e1103d89d2f65dbc4f04cf7a1f3d38e973c3d1a8/graphviz-0.7.1.zip";
+      md5 = "d5926e89975121d56dec777a79bfc9d1";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
   greenlet = super.buildPythonPackage {
     name = "greenlet-0.4.10";
     buildInputs = with self; [];
@@ -1085,7 +1098,7 b''
     name = "objgraph-3.1.0";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [];
+    propagatedBuildInputs = with self; [graphviz];
     src = fetchurl {
       url = "https://pypi.python.org/packages/f4/b3/082e54e62094cb2ec84f8d5a49e0142cef99016491cecba83309cff920ae/objgraph-3.1.0.tar.gz";
       md5 = "eddbd96039796bfbd13eee403701e64a";