release: merge back stable branch into default

docs/admin/nginx-config-example.rst

@@ -5,6 +5,7 @@ Use the following example to configure Nginx as a your web server.
 
 
 .. 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 @@ 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 @@ Welcome to the contribution guides and development docs of RhodeCode.
    dev-settings
    api
    dependencies
+   checklist-tickets
+   checklist-pull-request
+   frontend
+   standards
+

docs/integrations/ci.rst

@@ -35,7 +35,7 @@ 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:password@server.com/job/${project_id}
+    trigger URL, e.g. `http://user:password@server.com/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 @@ See pages specific to each type of integration for more instructions:
    jira
    webhook
    email
+   ci

docs/tutorials/api-examples.rst

@@ -48,14 +48,13 @@ the following steps:
 
     # 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 @@
     };
   };
   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 @@
       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 @@
     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";

rhodecode/i18n/rhodecode.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rhodecode-enterprise-ce 4.8.0\n"
 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
-"POT-Creation-Date: 2017-06-27 17:25+0200\n"
+"POT-Creation-Date: 2017-06-28 21:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -835,13 +835,13 @@ msgstr ""
 msgid "No such commit exists for this repository"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:343
+#: rhodecode/controllers/changeset.py:345
 #: rhodecode/controllers/pullrequests.py:919
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:387
+#: rhodecode/controllers/changeset.py:389
 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
 msgstr ""
 
@@ -4342,8 +4342,8 @@ msgid "(from usergroup {0})"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3
-#: rhodecode/templates/codeblocks/diffs.mako:488
-#: rhodecode/templates/codeblocks/diffs.mako:493
+#: rhodecode/templates/codeblocks/diffs.mako:487
+#: rhodecode/templates/codeblocks/diffs.mako:492
 msgid "Add another comment"
 msgstr ""
 
@@ -8146,8 +8146,8 @@ msgid "Diff options"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:139
-#: rhodecode/templates/codeblocks/diffs.mako:445
-#: rhodecode/templates/codeblocks/diffs.mako:448
+#: rhodecode/templates/codeblocks/diffs.mako:444
+#: rhodecode/templates/codeblocks/diffs.mako:447
 msgid "Raw diff"
 msgstr ""
 
@@ -8164,8 +8164,8 @@ msgid "Patch Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:147
-#: rhodecode/templates/codeblocks/diffs.mako:452
-#: rhodecode/templates/codeblocks/diffs.mako:455
+#: rhodecode/templates/codeblocks/diffs.mako:451
+#: rhodecode/templates/codeblocks/diffs.mako:454
 msgid "Download diff"
 msgstr ""
 
@@ -8449,65 +8449,65 @@ msgstr ""
 msgid "File was deleted in this version, and outdated comments were made on it"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:415
-#: rhodecode/templates/codeblocks/diffs.mako:431
+#: rhodecode/templates/codeblocks/diffs.mako:414
+#: rhodecode/templates/codeblocks/diffs.mako:430
 #, python-format
 msgid "Show file at commit: %(commit_id)s"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:417
-#: rhodecode/templates/codeblocks/diffs.mako:424
+#: rhodecode/templates/codeblocks/diffs.mako:416
+#: rhodecode/templates/codeblocks/diffs.mako:423
 msgid "Show file before"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:422
-#: rhodecode/templates/codeblocks/diffs.mako:438
+#: rhodecode/templates/codeblocks/diffs.mako:421
+#: rhodecode/templates/codeblocks/diffs.mako:437
 #, python-format
 msgid "File no longer present at commit: %(commit_id)s"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:433
-#: rhodecode/templates/codeblocks/diffs.mako:440
+#: rhodecode/templates/codeblocks/diffs.mako:432
+#: rhodecode/templates/codeblocks/diffs.mako:439
 msgid "Show file after"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:471
+#: rhodecode/templates/codeblocks/diffs.mako:470
 msgid "Show comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:471
+#: rhodecode/templates/codeblocks/diffs.mako:470
 msgid "Hide comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:643
+#: rhodecode/templates/codeblocks/diffs.mako:642
 msgid "View side by side"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:645
+#: rhodecode/templates/codeblocks/diffs.mako:644
 msgid "Side by Side"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:649
+#: rhodecode/templates/codeblocks/diffs.mako:648
 msgid "View unified"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:650
+#: rhodecode/templates/codeblocks/diffs.mako:649
 msgid "Unified"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:660
+#: rhodecode/templates/codeblocks/diffs.mako:659
 msgid "Expand All Files"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:664
+#: rhodecode/templates/codeblocks/diffs.mako:663
 msgid "Collapse All Files"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:668
+#: rhodecode/templates/codeblocks/diffs.mako:667
 msgid "Wide Mode Diff"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/source.mako:24
+#: rhodecode/templates/codeblocks/source.mako:25
 msgid "view annotation from before this change"
 msgstr ""
 
@@ -9602,6 +9602,10 @@ msgstr ""
 msgid "Save Changes"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:372
+msgid "Mandatory reviewer"
+msgstr ""
+
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:414
 msgid "Missing requirements:"
 msgstr ""

rhodecode/public/js/rhodecode/i18n/zh.js

@@ -77,7 +77,7 @@ var _TM = {
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
-    'just now': '刚才',
+    'just now': '刚刚',
     'loading...': 'loading...',
     'member of "{0}"': 'member of "{0}"',
     'resolve comment': 'resolve comment',