release: Merge default into stable for release preparation

docs/_templates/footer.html

@@ -0,0 +1,6 b''
+{% extends "!footer.html" %}
+
+{% block extrafooter %}
+<br/>
+Documentation defects and suggestions can be submitted <a href="https://issues.rhodecode.com/projects/documentation">here</a>
+{% endblock %}

docs/api/methods/deprecated-methods.rst

@@ -0,0 +1,77 b''
+.. _deprecated-methods-ref:
+
+deprecated methods
+=================
+
+changeset_comment 
+-----------------
+
+.. py:function:: changeset_comment(apiuser, repoid, revision, message, userid=<Optional:<OptionalAttr:apiuser>>, status=<Optional:None>)
+
+   .. deprecated:: 3.4.0
+
+          Please use method `comment_commit` instead.
+
+
+   Set a changeset comment, and optionally change the status of the
+   changeset.
+
+   This command can only be run using an |authtoken| with admin
+   permissions on the |repo|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Set the repository name or repository ID.
+   :type repoid: str or int
+   :param revision: Specify the revision for which to set a comment.
+   :type revision: str
+   :param message: The comment text.
+   :type message: str
+   :param userid: Set the user name of the comment creator.
+   :type userid: Optional(str or int)
+   :param status: Set the comment status. The following are valid options:
+       * not_reviewed
+       * approved
+       * rejected
+       * under_review
+   :type status: str
+
+   Example error output:
+
+   .. code-block:: json
+
+       {
+           "id" : <id_given_in_input>,
+           "result" : {
+               "msg": "Commented on commit `<revision>` for repository `<repoid>`",
+               "status_change": null or <status>,
+               "success": true
+           },
+           "error" : null
+       }
+
+
+get_locks 
+---------
+
+.. py:function:: get_locks(apiuser, userid=<Optional:<OptionalAttr:apiuser>>)
+
+   .. deprecated:: 4.0.0
+
+      Please use method `get_user_locks` instead.
+
+   None
+
+
+show_ip 
+-------
+
+.. py:function:: show_ip(apiuser, userid=<Optional:<OptionalAttr:apiuser>>)
+
+   .. deprecated:: 4.0.0
+
+      Please use method `get_ip` instead.
+
+   None
+
+

docs/api/methods/gist-methods.rst

@@ -0,0 +1,121 b''
+.. _gist-methods-ref:
+
+gist methods
+=================
+
+create_gist 
+-----------
+
+.. py:function:: create_gist(apiuser, files, gistid=<Optional:None>, owner=<Optional:<OptionalAttr:apiuser>>, gist_type=<Optional:u'public'>, lifetime=<Optional:-1>, acl_level=<Optional:u'acl_public'>, description=<Optional:''>)
+
+   Creates a new Gist.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param files: files to be added to the gist. The data structure has
+       to match the following example::
+
+         {'filename1': {'content':'...'}, 'filename2': {'content':'...'}}
+
+   :type files: dict
+   :param gistid: Set a custom id for the gist
+   :type gistid: Optional(str)
+   :param owner: Set the gist owner, defaults to api method caller
+   :type owner: Optional(str or int)
+   :param gist_type: type of gist ``public`` or ``private``
+   :type gist_type: Optional(str)
+   :param lifetime: time in minutes of gist lifetime
+   :type lifetime: Optional(int)
+   :param acl_level: acl level for this gist, can be
+       ``acl_public`` or ``acl_private`` If the value is set to
+       ``acl_private`` only logged in users are able to access this gist.
+       If not set it defaults to ``acl_public``.
+   :type acl_level: Optional(str)
+   :param description: gist description
+   :type description: Optional(str)
+
+   Example  output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       "msg": "created new gist",
+       "gist": {}
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "failed to create gist"
+     }
+
+
+delete_gist 
+-----------
+
+.. py:function:: delete_gist(apiuser, gistid)
+
+   Deletes existing gist
+
+   :param apiuser: filled automatically from apikey
+   :type apiuser: AuthUser
+   :param gistid: id of gist to delete
+   :type gistid: str
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       "deleted gist ID: <gist_id>",
+       "gist": null
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "failed to delete gist ID:<gist_id>"
+     }
+
+
+get_gist 
+--------
+
+.. py:function:: get_gist(apiuser, gistid, content=<Optional:False>)
+
+   Get the specified gist, based on the gist ID.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param gistid: Set the id of the private or public gist
+   :type gistid: str
+   :param content: Return the gist content. Default is false.
+   :type content: Optional(bool)
+
+
+get_gists 
+---------
+
+.. py:function:: get_gists(apiuser, userid=<Optional:<OptionalAttr:apiuser>>)
+
+   Get all gists for given user. If userid is empty returned gists
+   are for user who called the api
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param userid: user to get gists for
+   :type userid: Optional(str or int)
+
+

docs/api/methods/license-methods.rst

@@ -0,0 +1,71 b''
+.. _license-methods-ref:
+
+license methods
+=================
+
+get_license_info (EE only)
+----------------
+
+.. py:function:: get_license_info(apiuser)
+
+   Returns the |RCE| license information.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       'rhodecode_version': <rhodecode version>,
+       'token': <license token>,
+       'issued_to': <license owner>,
+       'issued_on': <license issue date>,
+       'expires_on': <license expiration date>,
+       'type': <license type>,
+       'users_limit': <license users limit>,
+       'key': <license key>
+     }
+     error :  null
+
+
+set_license_key (EE only)
+---------------
+
+.. py:function:: set_license_key(apiuser, key)
+
+   Sets the |RCE| license key.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param key: This is the license key to be set.
+   :type key: str
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg" : "updated license information",
+                 "key": <key>
+               }
+       error:  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "license key is not valid"
+       or
+       "trial licenses cannot be uploaded"
+       or
+       "error occurred while updating license"
+     }
+
+

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

@@ -0,0 +1,344 b''
+.. _pull-request-methods-ref:
+
+pull_request methods
+=================
+
+close_pull_request 
+------------------
+
+.. py:function:: close_pull_request(apiuser, repoid, pullrequestid, userid=<Optional:<OptionalAttr:apiuser>>)
+
+   Close the pull request specified by `pullrequestid`.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Repository name or repository ID to which the pull
+       request belongs.
+   :type repoid: str or int
+   :param pullrequestid: ID of the pull request to be closed.
+   :type pullrequestid: int
+   :param userid: Close the pull request as this user.
+   :type userid: Optional(str or int)
+
+   Example output:
+
+   .. code-block:: bash
+
+     "id": <id_given_in_input>,
+     "result":
+       {
+           "pull_request_id":  "<int>",
+           "closed":           "<bool>"
+       },
+     "error": null
+
+
+comment_pull_request 
+--------------------
+
+.. py:function:: comment_pull_request(apiuser, repoid, pullrequestid, message=<Optional:None>, status=<Optional:None>, userid=<Optional:<OptionalAttr:apiuser>>)
+
+   Comment on the pull request specified with the `pullrequestid`,
+   in the |repo| specified by the `repoid`, and optionally change the
+   review status.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The repository name or repository ID.
+   :type repoid: str or int
+   :param pullrequestid: The pull request ID.
+   :type pullrequestid: int
+   :param message: The text content of the comment.
+   :type message: str
+   :param status: (**Optional**) Set the approval status of the pull
+       request. Valid options are:
+       * not_reviewed
+       * approved
+       * rejected
+       * under_review
+   :type status: str
+   :param userid: Comment on the pull request as this user
+   :type userid: Optional(str or int)
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result :
+       {
+           "pull_request_id":  "<Integer>",
+           "comment_id":       "<Integer>"
+       }
+     error :  null
+
+
+create_pull_request 
+-------------------
+
+.. py:function:: create_pull_request(apiuser, source_repo, target_repo, source_ref, target_ref, title, description=<Optional:''>, reviewers=<Optional:None>)
+
+   Creates a new pull request.
+
+   Accepts refs in the following formats:
+
+       * branch:<branch_name>:<sha>
+       * branch:<branch_name>
+       * bookmark:<bookmark_name>:<sha> (Mercurial only)
+       * bookmark:<bookmark_name> (Mercurial only)
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param source_repo: Set the source repository name.
+   :type source_repo: str
+   :param target_repo: Set the target repository name.
+   :type target_repo: str
+   :param source_ref: Set the source ref name.
+   :type source_ref: str
+   :param target_ref: Set the target ref name.
+   :type target_ref: str
+   :param title: Set the pull request title.
+   :type title: str
+   :param description: Set the pull request description.
+   :type description: Optional(str)
+   :param reviewers: Set the new pull request reviewers list.
+   :type reviewers: Optional(list)
+
+
+get_pull_request 
+----------------
+
+.. py:function:: get_pull_request(apiuser, repoid, pullrequestid)
+
+   Get a pull request based on the given ID.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Repository name or repository ID from where the pull
+       request was opened.
+   :type repoid: str or int
+   :param pullrequestid: ID of the requested pull request.
+   :type pullrequestid: int
+
+   Example output:
+
+   .. code-block:: bash
+
+     "id": <id_given_in_input>,
+     "result":
+       {
+           "pull_request_id":   "<pull_request_id>",
+           "url":               "<url>",
+           "title":             "<title>",
+           "description":       "<description>",
+           "status" :           "<status>",
+           "created_on":        "<date_time_created>",
+           "updated_on":        "<date_time_updated>",
+           "commit_ids":        [
+                                    ...
+                                    "<commit_id>",
+                                    "<commit_id>",
+                                    ...
+                                ],
+           "review_status":    "<review_status>",
+           "mergeable":         {
+                                    "status":  "<bool>",
+                                    "message": "<message>",
+                                },
+           "source":            {
+                                    "clone_url":     "<clone_url>",
+                                    "repository":    "<repository_name>",
+                                    "reference":
+                                    {
+                                        "name":      "<name>",
+                                        "type":      "<type>",
+                                        "commit_id": "<commit_id>",
+                                    }
+                                },
+           "target":            {
+                                    "clone_url":   "<clone_url>",
+                                    "repository":    "<repository_name>",
+                                    "reference":
+                                    {
+                                        "name":      "<name>",
+                                        "type":      "<type>",
+                                        "commit_id": "<commit_id>",
+                                    }
+                                },
+          "author":             <user_obj>,
+          "reviewers":          [
+                                    ...
+                                    {
+                                       "user":          "<user_obj>",
+                                       "review_status": "<review_status>",
+                                    }
+                                    ...
+                                ]
+       },
+      "error": null
+
+
+get_pull_requests 
+-----------------
+
+.. py:function:: get_pull_requests(apiuser, repoid, status=<Optional:'new'>)
+
+   Get all pull requests from the repository specified in `repoid`.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Repository name or repository ID.
+   :type repoid: str or int
+   :param status: Only return pull requests with the specified status.
+       Valid options are.
+       * ``new`` (default)
+       * ``open``
+       * ``closed``
+   :type status: str
+
+   Example output:
+
+   .. code-block:: bash
+
+     "id": <id_given_in_input>,
+     "result":
+       [
+           ...
+           {
+               "pull_request_id":   "<pull_request_id>",
+               "url":               "<url>",
+               "title" :            "<title>",
+               "description":       "<description>",
+               "status":            "<status>",
+               "created_on":        "<date_time_created>",
+               "updated_on":        "<date_time_updated>",
+               "commit_ids":        [
+                                        ...
+                                        "<commit_id>",
+                                        "<commit_id>",
+                                        ...
+                                    ],
+               "review_status":    "<review_status>",
+               "mergeable":         {
+                                       "status":      "<bool>",
+                                       "message:      "<message>",
+                                    },
+               "source":            {
+                                        "clone_url":     "<clone_url>",
+                                        "reference":
+                                        {
+                                            "name":      "<name>",
+                                            "type":      "<type>",
+                                            "commit_id": "<commit_id>",
+                                        }
+                                    },
+               "target":            {
+                                        "clone_url":   "<clone_url>",
+                                        "reference":
+                                        {
+                                            "name":      "<name>",
+                                            "type":      "<type>",
+                                            "commit_id": "<commit_id>",
+                                        }
+                                    },
+              "author":             <user_obj>,
+              "reviewers":          [
+                                        ...
+                                        {
+                                           "user":          "<user_obj>",
+                                           "review_status": "<review_status>",
+                                        }
+                                        ...
+                                    ]
+           }
+           ...
+       ],
+     "error": null
+
+
+merge_pull_request 
+------------------
+
+.. py:function:: merge_pull_request(apiuser, repoid, pullrequestid, userid=<Optional:<OptionalAttr:apiuser>>)
+
+   Merge the pull request specified by `pullrequestid` into its target
+   repository.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The Repository name or repository ID of the
+       target repository to which the |pr| is to be merged.
+   :type repoid: str or int
+   :param pullrequestid: ID of the pull request which shall be merged.
+   :type pullrequestid: int
+   :param userid: Merge the pull request as this user.
+   :type userid: Optional(str or int)
+
+   Example output:
+
+   .. code-block:: bash
+
+     "id": <id_given_in_input>,
+     "result":
+       {
+           "executed":         "<bool>",
+           "failure_reason":   "<int>",
+           "merge_commit_id":  "<merge_commit_id>",
+           "possible":         "<bool>"
+       },
+     "error": null
+
+
+update_pull_request 
+-------------------
+
+.. py:function:: update_pull_request(apiuser, repoid, pullrequestid, title=<Optional:''>, description=<Optional:''>, reviewers=<Optional:None>, update_commits=<Optional:None>, close_pull_request=<Optional:None>)
+
+   Updates a pull request.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The repository name or repository ID.
+   :type repoid: str or int
+   :param pullrequestid: The pull request ID.
+   :type pullrequestid: int
+   :param title: Set the pull request title.
+   :type title: str
+   :param description: Update pull request description.
+   :type description: Optional(str)
+   :param reviewers: Update pull request reviewers list with new value.
+   :type reviewers: Optional(list)
+   :param update_commits: Trigger update of commits for this pull request
+   :type: update_commits: Optional(bool)
+   :param close_pull_request: Close this pull request with rejected state
+   :type: close_pull_request: Optional(bool)
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result :
+       {
+           "msg": "Updated pull request `63`",
+           "pull_request": <pull_request_object>,
+           "updated_reviewers": {
+             "added": [
+               "username"
+             ],
+             "removed": []
+           },
+           "updated_commits": {
+             "added": [
+               "<sha1_hash>"
+             ],
+             "common": [
+               "<sha1_hash>",
+               "<sha1_hash>",
+             ],
+             "removed": []
+           }
+       }
+     error :  null
+
+

docs/api/methods/repo-group-methods.rst

@@ -0,0 +1,350 b''
+.. _repo-group-methods-ref:
+
+repo_group methods
+=================
+
+create_repo_group 
+-----------------
+
+.. py:function:: create_repo_group(apiuser, group_name, description=<Optional:''>, owner=<Optional:<OptionalAttr:apiuser>>, copy_permissions=<Optional:False>)
+
+   Creates a repository group.
+
+   * If the repository group name contains "/", all the required repository
+     groups will be created.
+
+     For example "foo/bar/baz" will create |repo| groups "foo" and "bar"
+     (with "foo" as parent). It will also create the "baz" repository
+     with "bar" as |repo| group.
+
+   This command can only be run using an |authtoken| with admin
+   permissions.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param group_name: Set the repository group name.
+   :type group_name: str
+   :param description: Set the |repo| group description.
+   :type description: str
+   :param owner: Set the |repo| group owner.
+   :type owner: str
+   :param copy_permissions:
+   :type copy_permissions:
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+         "msg": "Created new repo group `<repo_group_name>`"
+         "repo_group": <repogroup_object>
+     }
+     error :  null
+
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       failed to create repo group `<repogroupid>`
+     }
+
+
+delete_repo_group 
+-----------------
+
+.. py:function:: delete_repo_group(apiuser, repogroupid)
+
+   Deletes a |repo| group.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repogroupid: Set the name or ID of repository group to be
+       deleted.
+   :type repogroupid: str or int
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       'msg': 'deleted repo group ID:<repogroupid> <repogroupname>
+       'repo_group': null
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "failed to delete repo group ID:<repogroupid> <repogroupname>"
+     }
+
+
+get_repo_group 
+--------------
+
+.. py:function:: get_repo_group(apiuser, repogroupid)
+
+   Return the specified |repo| group, along with permissions,
+   and repositories inside the group
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repogroupid: Specify the name of ID of the repository group.
+   :type repogroupid: str or int
+
+
+   Example output:
+
+   .. code-block:: bash
+
+       {
+         "error": null,
+         "id": repo-group-id,
+         "result": {
+           "group_description": "repo group description",
+           "group_id": 14,
+           "group_name": "group name",
+           "members": [
+             {
+               "name": "super-admin-username",
+               "origin": "super-admin",
+               "permission": "group.admin",
+               "type": "user"
+             },
+             {
+               "name": "owner-name",
+               "origin": "owner",
+               "permission": "group.admin",
+               "type": "user"
+             },
+             {
+               "name": "user-group-name",
+               "origin": "permission",
+               "permission": "group.write",
+               "type": "user_group"
+             }
+           ],
+           "owner": "owner-name",
+           "parent_group": null,
+           "repositories": [ repo-list ]
+         }
+       }
+
+
+get_repo_groups 
+---------------
+
+.. py:function:: get_repo_groups(apiuser)
+
+   Returns all repository groups.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+
+
+grant_user_group_permission_to_repo_group 
+-----------------------------------------
+
+.. py:function:: grant_user_group_permission_to_repo_group(apiuser, repogroupid, usergroupid, perm, apply_to_children=<Optional:'none'>)
+
+   Grant permission for a user group on given repository group, or update
+   existing permissions if found.
+
+   This command can only be run using an |authtoken| with admin
+   permissions on the |repo| group.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repogroupid: Set the name or id of repository group
+   :type repogroupid: str or int
+   :param usergroupid: id of usergroup
+   :type usergroupid: str or int
+   :param perm: (group.(none|read|write|admin))
+   :type perm: str
+   :param apply_to_children: 'none', 'repos', 'groups', 'all'
+   :type apply_to_children: str
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       "msg" : "Granted perm: `<perm>` (recursive:<apply_to_children>) for user group: `<usersgroupname>` in repo group: `<repo_group_name>`",
+       "success": true
+
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "failed to edit permission for user group: `<usergroup>` in repo group: `<repo_group_name>`"
+     }
+
+
+grant_user_permission_to_repo_group 
+-----------------------------------
+
+.. py:function:: grant_user_permission_to_repo_group(apiuser, repogroupid, userid, perm, apply_to_children=<Optional:'none'>)
+
+   Grant permission for a user on the given repository group, or update
+   existing permissions if found.
+
+   This command can only be run using an |authtoken| with admin
+   permissions.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repogroupid: Set the name or ID of repository group.
+   :type repogroupid: str or int
+   :param userid: Set the user name.
+   :type userid: str
+   :param perm: (group.(none|read|write|admin))
+   :type perm: str
+   :param apply_to_children: 'none', 'repos', 'groups', 'all'
+   :type apply_to_children: str
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg" : "Granted perm: `<perm>` (recursive:<apply_to_children>) for user: `<username>` in repo group: `<repo_group_name>`",
+                 "success": true
+               }
+       error:  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "failed to edit permission for user: `<userid>` in repo group: `<repo_group_name>`"
+     }
+
+
+revoke_user_group_permission_from_repo_group 
+--------------------------------------------
+
+.. py:function:: revoke_user_group_permission_from_repo_group(apiuser, repogroupid, usergroupid, apply_to_children=<Optional:'none'>)
+
+   Revoke permission for user group on given repository.
+
+   This command can only be run using an |authtoken| with admin
+   permissions on the |repo| group.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repogroupid: name or id of repository group
+   :type repogroupid: str or int
+   :param usergroupid:
+   :param apply_to_children: 'none', 'repos', 'groups', 'all'
+   :type apply_to_children: str
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg" : "Revoked perm (recursive:<apply_to_children>) for user group: `<usersgroupname>` in repo group: `<repo_group_name>`",
+                 "success": true
+               }
+       error:  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "failed to edit permission for user group: `<usergroup>` in repo group: `<repo_group_name>`"
+     }
+
+
+revoke_user_permission_from_repo_group 
+--------------------------------------
+
+.. py:function:: revoke_user_permission_from_repo_group(apiuser, repogroupid, userid, apply_to_children=<Optional:'none'>)
+
+   Revoke permission for a user in a given repository group.
+
+   This command can only be run using an |authtoken| with admin
+   permissions on the |repo| group.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repogroupid: Set the name or ID of the repository group.
+   :type repogroupid: str or int
+   :param userid: Set the user name to revoke.
+   :type userid: str
+   :param apply_to_children: 'none', 'repos', 'groups', 'all'
+   :type apply_to_children: str
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg" : "Revoked perm (recursive:<apply_to_children>) for user: `<username>` in repo group: `<repo_group_name>`",
+                 "success": true
+               }
+       error:  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "failed to edit permission for user: `<userid>` in repo group: `<repo_group_name>`"
+     }
+
+
+update_repo_group 
+-----------------
+
+.. py:function:: update_repo_group(apiuser, repogroupid, group_name=<Optional:''>, description=<Optional:''>, owner=<Optional:<OptionalAttr:apiuser>>, parent=<Optional:None>, enable_locking=<Optional:False>)
+
+   Updates repository group with the details given.
+
+   This command can only be run using an |authtoken| with admin
+   permissions.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repogroupid: Set the ID of repository group.
+   :type repogroupid: str or int
+   :param group_name: Set the name of the |repo| group.
+   :type group_name: str
+   :param description: Set a description for the group.
+   :type description: str
+   :param owner: Set the |repo| group owner.
+   :type owner: str
+   :param parent: Set the |repo| group parent.
+   :type parent: str or int
+   :param enable_locking: Enable |repo| locking. The default is false.
+   :type enable_locking: bool
+
+

docs/api/methods/repo-methods.rst

@@ -0,0 +1,967 b''
+.. _repo-methods-ref:
+
+repo methods
+=================
+
+add_field_to_repo 
+-----------------
+
+.. py:function:: add_field_to_repo(apiuser, repoid, key, label=<Optional:''>, description=<Optional:''>)
+
+   Adds an extra field to a repository.
+
+   This command can only be run using an |authtoken| with at least
+   write permissions to the |repo|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Set the repository name or repository id.
+   :type repoid: str or int
+   :param key: Create a unique field key for this repository.
+   :type key: str
+   :param label:
+   :type label: Optional(str)
+   :param description:
+   :type description: Optional(str)
+
+
+comment_commit 
+--------------
+
+.. py:function:: comment_commit(apiuser, repoid, commit_id, message, userid=<Optional:<OptionalAttr:apiuser>>, status=<Optional:None>)
+
+   Set a commit comment, and optionally change the status of the commit.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Set the repository name or repository ID.
+   :type repoid: str or int
+   :param commit_id: Specify the commit_id for which to set a comment.
+   :type commit_id: str
+   :param message: The comment text.
+   :type message: str
+   :param userid: Set the user name of the comment creator.
+   :type userid: Optional(str or int)
+   :param status: status, one of 'not_reviewed', 'approved', 'rejected',
+      'under_review'
+   :type status: str
+
+   Example error output:
+
+   .. code-block:: json
+
+       {
+           "id" : <id_given_in_input>,
+           "result" : {
+               "msg": "Commented on commit `<commit_id>` for repository `<repoid>`",
+               "status_change": null or <status>,
+               "success": true
+           },
+           "error" :  null
+       }
+
+
+create_repo 
+-----------
+
+.. py:function:: create_repo(apiuser, repo_name, repo_type, owner=<Optional:<OptionalAttr:apiuser>>, description=<Optional:''>, private=<Optional:False>, clone_uri=<Optional:None>, landing_rev=<Optional:'rev:tip'>, enable_statistics=<Optional:False>, enable_locking=<Optional:False>, enable_downloads=<Optional:False>, copy_permissions=<Optional:False>)
+
+   Creates a repository.
+
+   * If the repository name contains "/", all the required repository
+     groups will be created.
+
+     For example "foo/bar/baz" will create |repo| groups "foo" and "bar"
+     (with "foo" as parent). It will also create the "baz" repository
+     with "bar" as |repo| group.
+
+   This command can only be run using an |authtoken| with at least
+   write permissions to the |repo|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repo_name: Set the repository name.
+   :type repo_name: str
+   :param repo_type: Set the repository type; 'hg','git', or 'svn'.
+   :type repo_type: str
+   :param owner: user_id or username
+   :type owner: Optional(str)
+   :param description: Set the repository description.
+   :type description: Optional(str)
+   :param private:
+   :type private: bool
+   :param clone_uri:
+   :type clone_uri: str
+   :param landing_rev: <rev_type>:<rev>
+   :type landing_rev: str
+   :param enable_locking:
+   :type enable_locking: bool
+   :param enable_downloads:
+   :type enable_downloads: bool
+   :param enable_statistics:
+   :type enable_statistics: bool
+   :param copy_permissions: Copy permission from group in which the
+       repository is being created.
+   :type copy_permissions: bool
+
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg": "Created new repository `<reponame>`",
+                 "success": true,
+                 "task": "<celery task id or None if done sync>"
+               }
+       error:  null
+
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+        'failed to create repository `<repo_name>`
+     }
+
+
+delete_repo 
+-----------
+
+.. py:function:: delete_repo(apiuser, repoid, forks=<Optional:''>)
+
+   Deletes a repository.
+
+   * When the `forks` parameter is set it's possible to detach or delete
+     forks of deleted repository.
+
+   This command can only be run using an |authtoken| with admin
+   permissions on the |repo|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Set the repository name or repository ID.
+   :type repoid: str or int
+   :param forks: Set to `detach` or `delete` forks from the |repo|.
+   :type forks: Optional(str)
+
+   Example error output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg": "Deleted repository `<reponame>`",
+                 "success": true
+               }
+       error:  null
+
+
+fork_repo 
+---------
+
+.. py:function:: fork_repo(apiuser, repoid, fork_name, owner=<Optional:<OptionalAttr:apiuser>>, description=<Optional:''>, copy_permissions=<Optional:False>, private=<Optional:False>, landing_rev=<Optional:'rev:tip'>)
+
+   Creates a fork of the specified |repo|.
+
+   * If using |RCE| with Celery this will immediately return a success
+     message, even though the fork will be created asynchronously.
+
+   This command can only be run using an |authtoken| with fork
+   permissions on the |repo|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Set repository name or repository ID.
+   :type repoid: str or int
+   :param fork_name: Set the fork name.
+   :type fork_name: str
+   :param owner: Set the fork owner.
+   :type owner: str
+   :param description: Set the fork descripton.
+   :type description: str
+   :param copy_permissions: Copy permissions from parent |repo|. The
+       default is False.
+   :type copy_permissions: bool
+   :param private: Make the fork private. The default is False.
+   :type private: bool
+   :param landing_rev: Set the landing revision. The default is tip.
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_for_response>
+       api_key : "<api_key>"
+       args:     {
+                   "repoid" :          "<reponame or repo_id>",
+                   "fork_name":        "<forkname>",
+                   "owner":            "<username or user_id = Optional(=apiuser)>",
+                   "description":      "<description>",
+                   "copy_permissions": "<bool>",
+                   "private":          "<bool>",
+                   "landing_rev":      "<landing_rev>"
+                 }
+
+   Example error output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg": "Created fork of `<reponame>` as `<forkname>`",
+                 "success": true,
+                 "task": "<celery task id or None if done sync>"
+               }
+       error:  null
+
+
+get_repo 
+--------
+
+.. py:function:: get_repo(apiuser, repoid, cache=<Optional:True>)
+
+   Gets an existing repository by its name or repository_id.
+
+   The members section so the output returns users groups or users
+   associated with that repository.
+
+   This command can only be run using an |authtoken| with admin rights,
+   or users with at least read rights to the |repo|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The repository name or repository id.
+   :type repoid: str or int
+   :param cache: use the cached value for last changeset
+   :type: cache: Optional(bool)
+
+   Example output:
+
+   .. code-block:: bash
+
+       {
+         "error": null,
+         "id": <repo_id>,
+         "result": {
+           "clone_uri": null,
+           "created_on": "timestamp",
+           "description": "repo description",
+           "enable_downloads": false,
+           "enable_locking": false,
+           "enable_statistics": false,
+           "followers": [
+             {
+               "active": true,
+               "admin": false,
+               "api_key": "****************************************",
+               "api_keys": [
+                 "****************************************"
+               ],
+               "email": "[e-mail]",
+               "emails": [
+                 "[e-mail]"
+               ],
+               "extern_name": "rhodecode",
+               "extern_type": "rhodecode",
+               "firstname": "username",
+               "ip_addresses": [],
+               "language": null,
+               "last_login": "2015-09-16T17:16:35.854",
+               "lastname": "surname",
+               "user_id": <user_id>,
+               "username": "name"
+             }
+           ],
+           "fork_of": "parent-repo",
+           "landing_rev": [
+             "rev",
+             "tip"
+           ],
+           "last_changeset": {
+             "author": "User <[e-mail]>",
+             "branch": "default",
+             "date": "timestamp",
+             "message": "last commit message",
+             "parents": [
+               {
+                 "raw_id": "commit-id"
+               }
+             ],
+             "raw_id": "commit-id",
+             "revision": <revision number>,
+             "short_id": "short id"
+           },
+           "lock_reason": null,
+           "locked_by": null,
+           "locked_date": null,
+           "members": [
+             {
+               "name": "super-admin-name",
+               "origin": "super-admin",
+               "permission": "repository.admin",
+               "type": "user"
+             },
+             {
+               "name": "owner-name",
+               "origin": "owner",
+               "permission": "repository.admin",
+               "type": "user"
+             },
+             {
+               "name": "user-group-name",
+               "origin": "permission",
+               "permission": "repository.write",
+               "type": "user_group"
+             }
+           ],
+           "owner": "owner-name",
+           "permissions": [
+             {
+               "name": "super-admin-name",
+               "origin": "super-admin",
+               "permission": "repository.admin",
+               "type": "user"
+             },
+             {
+               "name": "owner-name",
+               "origin": "owner",
+               "permission": "repository.admin",
+               "type": "user"
+             },
+             {
+               "name": "user-group-name",
+               "origin": "permission",
+               "permission": "repository.write",
+               "type": "user_group"
+             }
+           ],
+           "private": true,
+           "repo_id": 676,
+           "repo_name": "user-group/repo-name",
+           "repo_type": "hg"
+         }
+       }
+
+
+get_repo_changeset 
+------------------
+
+.. py:function:: get_repo_changeset(apiuser, repoid, revision, details=<Optional:'basic'>)
+
+   Returns information about a changeset.
+
+   Additionally parameters define the amount of details returned by
+   this function.
+
+   This command can only be run using an |authtoken| with admin rights,
+   or users with at least read rights to the |repo|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The repository name or repository id
+   :type repoid: str or int
+   :param revision: revision for which listing should be done
+   :type revision: str
+   :param details: details can be 'basic|extended|full' full gives diff
+       info details like the diff itself, and number of changed files etc.
+   :type details: Optional(str)
+
+
+get_repo_changesets 
+-------------------
+
+.. py:function:: get_repo_changesets(apiuser, repoid, start_rev, limit, details=<Optional:'basic'>)
+
+   Returns a set of commits limited by the number starting
+   from the `start_rev` option.
+
+   Additional parameters define the amount of details returned by this
+   function.
+
+   This command can only be run using an |authtoken| with admin rights,
+   or users with at least read rights to |repos|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The repository name or repository ID.
+   :type repoid: str or int
+   :param start_rev: The starting revision from where to get changesets.
+   :type start_rev: str
+   :param limit: Limit the number of commits to this amount
+   :type limit: str or int
+   :param details: Set the level of detail returned. Valid option are:
+       ``basic``, ``extended`` and ``full``.
+   :type details: Optional(str)
+
+   .. note::
+
+      Setting the parameter `details` to the value ``full`` is extensive
+      and returns details like the diff itself, and the number
+      of changed files.
+
+
+get_repo_nodes 
+--------------
+
+.. py:function:: get_repo_nodes(apiuser, repoid, revision, root_path, ret_type=<Optional:'all'>, details=<Optional:'basic'>, max_file_bytes=<Optional:None>)
+
+   Returns a list of nodes and children in a flat list for a given
+   path at given revision.
+
+   It's possible to specify ret_type to show only `files` or `dirs`.
+
+   This command can only be run using an |authtoken| with admin rights,
+   or users with at least read rights to |repos|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The repository name or repository ID.
+   :type repoid: str or int
+   :param revision: The revision for which listing should be done.
+   :type revision: str
+   :param root_path: The path from which to start displaying.
+   :type root_path: str
+   :param ret_type: Set the return type. Valid options are
+       ``all`` (default), ``files`` and ``dirs``.
+   :type ret_type: Optional(str)
+   :param details: Returns extended information about nodes, such as
+       md5, binary, and or content.  The valid options are ``basic`` and
+       ``full``.
+   :type details: Optional(str)
+   :param max_file_bytes: Only return file content under this file size bytes
+   :type details: Optional(int)
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: [
+                 {
+                   "name" : "<name>"
+                   "type" : "<type>",
+                   "binary": "<true|false>" (only in extended mode)
+                   "md5"  : "<md5 of file content>" (only in extended mode)
+                 },
+                 ...
+               ]
+       error:  null
+
+
+get_repo_refs 
+-------------
+
+.. py:function:: get_repo_refs(apiuser, repoid)
+
+   Returns a dictionary of current references. It returns
+   bookmarks, branches, closed_branches, and tags for given repository
+
+   It's possible to specify ret_type to show only `files` or `dirs`.
+
+   This command can only be run using an |authtoken| with admin rights,
+   or users with at least read rights to |repos|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The repository name or repository ID.
+   :type repoid: str or int
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: [
+                 TODO...
+               ]
+       error:  null
+
+
+get_repo_settings 
+-----------------
+
+.. py:function:: get_repo_settings(apiuser, repoid, key=<Optional:None>)
+
+   Returns all settings for a repository. If key is given it only returns the
+   setting identified by the key or null.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The repository name or repository id.
+   :type repoid: str or int
+   :param key: Key of the setting to return.
+   :type: key: Optional(str)
+
+   Example output:
+
+   .. code-block:: bash
+
+       {
+           "error": null,
+           "id": 237,
+           "result": {
+               "extensions_largefiles": true,
+               "hooks_changegroup_push_logger": true,
+               "hooks_changegroup_repo_size": false,
+               "hooks_outgoing_pull_logger": true,
+               "phases_publish": "True",
+               "rhodecode_hg_use_rebase_for_merging": true,
+               "rhodecode_pr_merge_enabled": true,
+               "rhodecode_use_outdated_comments": true
+           }
+       }
+
+
+get_repos 
+---------
+
+.. py:function:: get_repos(apiuser)
+
+   Lists all existing repositories.
+
+   This command can only be run using an |authtoken| with admin rights,
+   or users with at least read rights to |repos|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: [
+                 {
+                   "repo_id" :          "<repo_id>",
+                   "repo_name" :        "<reponame>"
+                   "repo_type" :        "<repo_type>",
+                   "clone_uri" :        "<clone_uri>",
+                   "private": :         "<bool>",
+                   "created_on" :       "<datetimecreated>",
+                   "description" :      "<description>",
+                   "landing_rev":       "<landing_rev>",
+                   "owner":             "<repo_owner>",
+                   "fork_of":           "<name_of_fork_parent>",
+                   "enable_downloads":  "<bool>",
+                   "enable_locking":    "<bool>",
+                   "enable_statistics": "<bool>",
+                 },
+                 ...
+               ]
+       error:  null
+
+
+grant_user_group_permission 
+---------------------------
+
+.. py:function:: grant_user_group_permission(apiuser, repoid, usergroupid, perm)
+
+   Grant permission for a user group on the specified repository,
+   or update existing permissions.
+
+   This command can only be run using an |authtoken| with admin
+   permissions on the |repo|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Set the repository name or repository ID.
+   :type repoid: str or int
+   :param usergroupid: Specify the ID of the user group.
+   :type usergroupid: str or int
+   :param perm: Set the user group permissions using the following
+       format: (repository.(none|read|write|admin))
+   :type perm: str
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       "msg" : "Granted perm: `<perm>` for group: `<usersgroupname>` in repo: `<reponame>`",
+       "success": true
+
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "failed to edit permission for user group: `<usergroup>` in repo `<repo>`'
+     }
+
+
+grant_user_permission 
+---------------------
+
+.. py:function:: grant_user_permission(apiuser, repoid, userid, perm)
+
+   Grant permissions for the specified user on the given repository,
+   or update existing permissions if found.
+
+   This command can only be run using an |authtoken| with admin
+   permissions on the |repo|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Set the repository name or repository ID.
+   :type repoid: str or int
+   :param userid: Set the user name.
+   :type userid: str
+   :param perm: Set the user permissions, using the following format
+       ``(repository.(none|read|write|admin))``
+   :type perm: str
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg" : "Granted perm: `<perm>` for user: `<username>` in repo: `<reponame>`",
+                 "success": true
+               }
+       error:  null
+
+
+invalidate_cache 
+----------------
+
+.. py:function:: invalidate_cache(apiuser, repoid, delete_keys=<Optional:False>)
+
+   Invalidates the cache for the specified repository.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Sets the repository name or repository ID.
+   :type repoid: str or int
+   :param delete_keys: This deletes the invalidated keys instead of
+       just flagging them.
+   :type delete_keys: Optional(``True`` | ``False``)
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       'msg': Cache for repository `<repository name>` was invalidated,
+       'repository': <repository name>
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error : {
+        'Error occurred during cache invalidation action'
+     }
+
+
+lock 
+----
+
+.. py:function:: lock(apiuser, repoid, locked=<Optional:None>, userid=<Optional:<OptionalAttr:apiuser>>)
+
+   Sets the lock state of the specified |repo| by the given user.
+   From more information, see :ref:`repo-locking`.
+
+   * If the ``userid`` option is not set, the repository is locked to the
+     user who called the method.
+   * If the ``locked`` parameter is not set, the current lock state of the
+     repository is displayed.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Sets the repository name or repository ID.
+   :type repoid: str or int
+   :param locked: Sets the lock state.
+   :type locked: Optional(``True`` | ``False``)
+   :param userid: Set the repository lock to this user.
+   :type userid: Optional(str or int)
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       'repo': '<reponame>',
+       'locked': <bool: lock state>,
+       'locked_since': <int: lock timestamp>,
+       'locked_by': <username of person who made the lock>,
+       'lock_reason': <str: reason for locking>,
+       'lock_state_changed': <bool: True if lock state has been changed in this request>,
+       'msg': 'Repo `<reponame>` locked by `<username>` on <timestamp>.'
+       or
+       'msg': 'Repo `<repository name>` not locked.'
+       or
+       'msg': 'User `<user name>` set lock state for repo `<repository name>` to `<new lock state>`'
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       'Error occurred locking repository `<reponame>`
+     }
+
+
+pull 
+----
+
+.. py:function:: pull(apiuser, repoid)
+
+   Triggers a pull on the given repository from a remote location. You
+   can use this to keep remote repositories up-to-date.
+
+   This command can only be run using an |authtoken| with admin
+   rights to the specified repository. For more information,
+   see :ref:`config-token-ref`.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The repository name or repository ID.
+   :type repoid: str or int
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       "msg": "Pulled from `<repository name>`"
+       "repository": "<repository name>"
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "Unable to pull changes from `<reponame>`"
+     }
+
+
+remove_field_from_repo 
+----------------------
+
+.. py:function:: remove_field_from_repo(apiuser, repoid, key)
+
+   Removes an extra field from a repository.
+
+   This command can only be run using an |authtoken| with at least
+   write permissions to the |repo|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Set the repository name or repository ID.
+   :type repoid: str or int
+   :param key: Set the unique field key for this repository.
+   :type key: str
+
+
+revoke_user_group_permission 
+----------------------------
+
+.. py:function:: revoke_user_group_permission(apiuser, repoid, usergroupid)
+
+   Revoke the permissions of a user group on a given repository.
+
+   This command can only be run using an |authtoken| with admin
+   permissions on the |repo|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Set the repository name or repository ID.
+   :type repoid: str or int
+   :param usergroupid: Specify the user group ID.
+   :type usergroupid: str or int
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg" : "Revoked perm for group: `<usersgroupname>` in repo: `<reponame>`",
+                 "success": true
+               }
+       error:  null
+
+
+revoke_user_permission 
+----------------------
+
+.. py:function:: revoke_user_permission(apiuser, repoid, userid)
+
+   Revoke permission for a user on the specified repository.
+
+   This command can only be run using an |authtoken| with admin
+   permissions on the |repo|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: Set the repository name or repository ID.
+   :type repoid: str or int
+   :param userid: Set the user name of revoked user.
+   :type userid: str or int
+
+   Example error output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg" : "Revoked perm for user: `<username>` in repo: `<reponame>`",
+                 "success": true
+               }
+       error:  null
+
+
+set_repo_settings 
+-----------------
+
+.. py:function:: set_repo_settings(apiuser, repoid, settings)
+
+   Update repository settings. Returns true on success.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The repository name or repository id.
+   :type repoid: str or int
+   :param settings: The new settings for the repository.
+   :type: settings: dict
+
+   Example output:
+
+   .. code-block:: bash
+
+       {
+           "error": null,
+           "id": 237,
+           "result": true
+       }
+
+
+strip 
+-----
+
+.. py:function:: strip(apiuser, repoid, revision, branch)
+
+   Strips the given revision from the specified repository.
+
+   * This will remove the revision and all of its decendants.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: The repository name or repository ID.
+   :type repoid: str or int
+   :param revision: The revision you wish to strip.
+   :type revision: str
+   :param branch: The branch from which to strip the revision.
+   :type branch: str
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       "msg": "'Stripped commit <commit_hash> from repo `<repository name>`'"
+       "repository": "<repository name>"
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "Unable to strip commit <commit_hash> from repo `<repository name>`"
+     }
+
+
+update_repo 
+-----------
+
+.. py:function:: update_repo(apiuser, repoid, name=<Optional:None>, owner=<Optional:<OptionalAttr:apiuser>>, group=<Optional:None>, fork_of=<Optional:None>, description=<Optional:''>, private=<Optional:False>, clone_uri=<Optional:None>, landing_rev=<Optional:'rev:tip'>, enable_statistics=<Optional:False>, enable_locking=<Optional:False>, enable_downloads=<Optional:False>, fields=<Optional:''>)
+
+   Updates a repository with the given information.
+
+   This command can only be run using an |authtoken| with at least
+   write permissions to the |repo|.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param repoid: repository name or repository ID.
+   :type repoid: str or int
+   :param name: Update the |repo| name.
+   :type name: str
+   :param owner: Set the |repo| owner.
+   :type owner: str
+   :param group: Set the |repo| group the |repo| belongs to.
+   :type group: str
+   :param fork_of: Set the master |repo| name.
+   :type fork_of: str
+   :param description: Update the |repo| description.
+   :type description: str
+   :param private: Set the |repo| as private. (True | False)
+   :type private: bool
+   :param clone_uri: Update the |repo| clone URI.
+   :type clone_uri: str
+   :param landing_rev: Set the |repo| landing revision. Default is
+       ``tip``.
+   :type landing_rev: str
+   :param enable_statistics: Enable statistics on the |repo|,
+       (True | False).
+   :type enable_statistics: bool
+   :param enable_locking: Enable |repo| locking.
+   :type enable_locking: bool
+   :param enable_downloads: Enable downloads from the |repo|,
+       (True | False).
+   :type enable_downloads: bool
+   :param fields: Add extra fields to the |repo|. Use the following
+       example format: ``field_key=field_val,field_key2=fieldval2``.
+       Escape ', ' with \,
+   :type fields: str
+
+

docs/api/methods/server-methods.rst

@@ -0,0 +1,115 b''
+.. _server-methods-ref:
+
+server methods
+=================
+
+get_ip 
+------
+
+.. py:function:: get_ip(apiuser, userid=<Optional:<OptionalAttr:apiuser>>)
+
+   Displays the IP Address as seen from the |RCE| server.
+
+   * This command displays the IP Address, as well as all the defined IP
+     addresses for the specified user. If the ``userid`` is not set, the
+     data returned is for the user calling the method.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from |authtoken|.
+   :type apiuser: AuthUser
+   :param userid: Sets the userid for which associated IP Address data
+       is returned.
+   :type userid: Optional(str or int)
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result : {
+                    "server_ip_addr": "<ip_from_clien>",
+                    "user_ips": [
+                                   {
+                                      "ip_addr": "<ip_with_mask>",
+                                      "ip_range": ["<start_ip>", "<end_ip>"],
+                                   },
+                                   ...
+                                ]
+       }
+
+
+get_server_info 
+---------------
+
+.. py:function:: get_server_info(apiuser)
+
+   Returns the |RCE| server information.
+
+   This includes the running version of |RCE| and all installed
+   packages. This command takes the following options:
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       'modules': [<module name>,...]
+       'py_version': <python version>,
+       'platform': <platform type>,
+       'rhodecode_version': <rhodecode version>
+     }
+     error :  null
+
+
+rescan_repos 
+------------
+
+.. py:function:: rescan_repos(apiuser, remove_obsolete=<Optional:False>)
+
+   Triggers a rescan of the specified repositories.
+
+   * If the ``remove_obsolete`` option is set, it also deletes repositories
+     that are found in the database but not on the file system, so called
+     "clean zombies".
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param remove_obsolete: Deletes repositories from the database that
+       are not found on the filesystem.
+   :type remove_obsolete: Optional(``True`` | ``False``)
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       'added': [<added repository name>,...]
+       'removed': [<removed repository name>,...]
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       'Error occurred during rescan repositories action'
+     }
+
+

docs/api/methods/user-group-methods.rst

@@ -0,0 +1,406 b''
+.. _user-group-methods-ref:
+
+user_group methods
+=================
+
+add_user_to_user_group 
+----------------------
+
+.. py:function:: add_user_to_user_group(apiuser, usergroupid, userid)
+
+   Adds a user to a `user group`. If the user already exists in the group
+   this command will return false.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified user group.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param usergroupid: Set the name of the `user group` to which a
+       user will be added.
+   :type usergroupid: int
+   :param userid: Set the `user_id` of the user to add to the group.
+   :type userid: int
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+         "success": True|False # depends on if member is in group
+         "msg": "added member `<username>` to user group `<groupname>` |
+                 User is already in that group"
+
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "failed to add member to user group `<user_group_name>`"
+     }
+
+
+create_user_group 
+-----------------
+
+.. py:function:: create_user_group(apiuser, group_name, description=<Optional:''>, owner=<Optional:<OptionalAttr:apiuser>>, active=<Optional:True>)
+
+   Creates a new user group.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param group_name: Set the name of the new user group.
+   :type group_name: str
+   :param description: Give a description of the new user group.
+   :type description: str
+   :param owner: Set the owner of the new user group.
+       If not set, the owner is the |authtoken| user.
+   :type owner: Optional(str or int)
+   :param active: Set this group as active.
+   :type active: Optional(``True`` | ``False``)
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg": "created new user group `<groupname>`",
+                 "user_group": <user_group_object>
+               }
+       error:  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "user group `<group name>` already exist"
+       or
+       "failed to create group `<group name>`"
+     }
+
+
+delete_user_group 
+-----------------
+
+.. py:function:: delete_user_group(apiuser, usergroupid)
+
+   Deletes the specified `user group`.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   This command takes the following options:
+
+   :param apiuser: filled automatically from apikey
+   :type apiuser: AuthUser
+   :param usergroupid:
+   :type usergroupid: int
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       "msg": "deleted user group ID:<user_group_id> <user_group_name>"
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "failed to delete user group ID:<user_group_id> <user_group_name>"
+       or
+       "RepoGroup assigned to <repo_groups_list>"
+     }
+
+
+get_user_group 
+--------------
+
+.. py:function:: get_user_group(apiuser, usergroupid)
+
+   Returns the data of an existing user group.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param usergroupid: Set the user group from which to return data.
+   :type usergroupid: str or int
+
+   Example error output:
+
+   .. code-block:: bash
+
+       {
+         "error": null,
+         "id": <id>,
+         "result": {
+           "active": true,
+           "group_description": "group description",
+           "group_name": "group name",
+           "members": [
+             {
+               "name": "owner-name",
+               "origin": "owner",
+               "permission": "usergroup.admin",
+               "type": "user"
+             },
+             {
+             {
+               "name": "user name",
+               "origin": "permission",
+               "permission": "usergroup.admin",
+               "type": "user"
+             },
+             {
+               "name": "user group name",
+               "origin": "permission",
+               "permission": "usergroup.write",
+               "type": "user_group"
+             }
+           ],
+           "owner": "owner name",
+           "users": [],
+           "users_group_id": 2
+         }
+       }
+
+
+get_user_groups 
+---------------
+
+.. py:function:: get_user_groups(apiuser)
+
+   Lists all the existing user groups within RhodeCode.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+
+   Example error output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result : [<user_group_obj>,...]
+       error : null
+
+
+grant_user_group_permission_to_user_group 
+-----------------------------------------
+
+.. py:function:: grant_user_group_permission_to_user_group(apiuser, usergroupid, sourceusergroupid, perm)
+
+   Give one user group permissions to another user group.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param usergroupid: Set the user group on which to edit permissions.
+   :type usergroupid: str or int
+   :param sourceusergroupid: Set the source user group to which
+       access/permissions will be granted.
+   :type sourceusergroupid: str or int
+   :param perm: (usergroup.(none|read|write|admin))
+   :type perm: str
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       "msg": "Granted perm: `<perm_name>` for user group: `<source_user_group_name>` in user group: `<user_group_name>`",
+       "success": true
+     }
+     error :  null
+
+
+grant_user_permission_to_user_group 
+-----------------------------------
+
+.. py:function:: grant_user_permission_to_user_group(apiuser, usergroupid, userid, perm)
+
+   Set permissions for a user in a user group.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param usergroupid: Set the user group to edit permissions on.
+   :type usergroupid: str or int
+   :param userid: Set the user from whom you wish to set permissions.
+   :type userid: str
+   :param perm: (usergroup.(none|read|write|admin))
+   :type perm: str
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       "msg": "Granted perm: `<perm_name>` for user: `<username>` in user group: `<user_group_name>`",
+       "success": true
+     }
+     error :  null
+
+
+remove_user_from_user_group 
+---------------------------
+
+.. py:function:: remove_user_from_user_group(apiuser, usergroupid, userid)
+
+   Removes a user from a user group.
+
+   * If the specified user is not in the group, this command will return
+     `false`.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified user group.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param usergroupid: Sets the user group name.
+   :type usergroupid: str or int
+   :param userid: The user you wish to remove from |RCE|.
+   :type userid: str or int
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "success":  True|False,  # depends on if member is in group
+                 "msg": "removed member <username> from user group <groupname> |
+                         User wasn't in group"
+               }
+       error:  null
+
+
+revoke_user_group_permission_from_user_group 
+--------------------------------------------
+
+.. py:function:: revoke_user_group_permission_from_user_group(apiuser, usergroupid, sourceusergroupid)
+
+   Revoke the permissions that one user group has to another.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param usergroupid: Set the user group on which to edit permissions.
+   :type usergroupid: str or int
+   :param sourceusergroupid: Set the user group from which permissions
+       are revoked.
+   :type sourceusergroupid: str or int
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       "msg": "Revoked perm for user group: `<user_group_name>` in user group: `<target_user_group_name>`",
+       "success": true
+     }
+     error :  null
+
+
+revoke_user_permission_from_user_group 
+--------------------------------------
+
+.. py:function:: revoke_user_permission_from_user_group(apiuser, usergroupid, userid)
+
+   Revoke a users permissions in a user group.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param usergroupid: Set the user group from which to revoke the user
+       permissions.
+   :type: usergroupid: str or int
+   :param userid: Set the userid of the user whose permissions will be
+       revoked.
+   :type userid: str
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       "msg": "Revoked perm for user: `<username>` in user group: `<user_group_name>`",
+       "success": true
+     }
+     error :  null
+
+
+update_user_group 
+-----------------
+
+.. py:function:: update_user_group(apiuser, usergroupid, group_name=<Optional:''>, description=<Optional:''>, owner=<Optional:None>, active=<Optional:True>)
+
+   Updates the specified `user group` with the details provided.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param usergroupid: Set the id of the `user group` to update.
+   :type usergroupid: str or int
+   :param group_name: Set the new name the `user group`
+   :type group_name: str
+   :param description: Give a description for the `user group`
+   :type description: str
+   :param owner: Set the owner of the `user group`.
+   :type owner: Optional(str or int)
+   :param active: Set the group as active.
+   :type active: Optional(``True`` | ``False``)
+
+   Example output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : {
+       "msg": 'updated user group ID:<user group id> <user group name>',
+       "user_group": <user_group_object>
+     }
+     error :  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "failed to update user group `<user group name>`"
+     }
+
+

docs/api/methods/user-methods.rst

@@ -0,0 +1,295 b''
+.. _user-methods-ref:
+
+user methods
+=================
+
+create_user 
+-----------
+
+.. py:function:: create_user(apiuser, username, email, password=<Optional:''>, firstname=<Optional:''>, lastname=<Optional:''>, active=<Optional:True>, admin=<Optional:False>, extern_name=<Optional:'rhodecode'>, extern_type=<Optional:'rhodecode'>, force_password_change=<Optional:False>)
+
+   Creates a new user and returns the new user object.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param username: Set the new username.
+   :type username: str or int
+   :param email: Set the user email address.
+   :type email: str
+   :param password: Set the new user password.
+   :type password: Optional(str)
+   :param firstname: Set the new user firstname.
+   :type firstname: Optional(str)
+   :param lastname: Set the new user surname.
+   :type lastname: Optional(str)
+   :param active: Set the user as active.
+   :type active: Optional(``True`` | ``False``)
+   :param admin: Give the new user admin rights.
+   :type admin: Optional(``True`` | ``False``)
+   :param extern_name: Set the authentication plugin name.
+       Using LDAP this is filled with LDAP UID.
+   :type extern_name: Optional(str)
+   :param extern_type: Set the new user authentication plugin.
+   :type extern_type: Optional(str)
+   :param force_password_change: Force the new user to change password
+       on next login.
+   :type force_password_change: Optional(``True`` | ``False``)
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg" : "created new user `<username>`",
+                 "user": <user_obj>
+               }
+       error:  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "user `<username>` already exist"
+       or
+       "email `<email>` already exist"
+       or
+       "failed to create user `<username>`"
+     }
+
+
+delete_user 
+-----------
+
+.. py:function:: delete_user(apiuser, userid)
+
+   Deletes the specified user from the |RCE| user database.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   .. important::
+
+      Ensure all open pull requests and open code review
+      requests to this user are close.
+
+      Also ensure all repositories, or repository groups owned by this
+      user are reassigned before deletion.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param userid: Set the user to delete.
+   :type userid: str or int
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg" : "deleted user ID:<userid> <username>",
+                 "user": null
+               }
+       error:  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "failed to delete user ID:<userid> <username>"
+     }
+
+
+get_user 
+--------
+
+.. py:function:: get_user(apiuser, userid=<Optional:<OptionalAttr:apiuser>>)
+
+   Returns the information associated with a username or userid.
+
+   * If the ``userid`` is not set, this command returns the information
+     for the ``userid`` calling the method.
+
+   .. note::
+
+      Normal users may only run this command against their ``userid``. For
+      full privileges you must run this command using an |authtoken| with
+      admin rights.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param userid: Sets the userid for which data will be returned.
+   :type userid: Optional(str or int)
+
+   Example output:
+
+   .. code-block:: bash
+
+       {
+         "error": null,
+         "id": <id>,
+         "result": {
+           "active": true,
+           "admin": false,
+           "api_key": "api-key",
+           "api_keys": [ list of keys ],
+           "email": "[e-mail]",
+           "emails": [
+             "[e-mail]"
+           ],
+           "extern_name": "rhodecode",
+           "extern_type": "rhodecode",
+           "firstname": "username",
+           "ip_addresses": [],
+           "language": null,
+           "last_login": "Timestamp",
+           "lastname": "surnae",
+           "permissions": {
+             "global": [
+               "hg.inherit_default_perms.true",
+               "usergroup.read",
+               "hg.repogroup.create.false",
+               "hg.create.none",
+               "hg.extern_activate.manual",
+               "hg.create.write_on_repogroup.false",
+               "hg.usergroup.create.false",
+               "group.none",
+               "repository.none",
+               "hg.register.none",
+               "hg.fork.repository"
+             ],
+             "repositories": { "username/example": "repository.write"},
+             "repositories_groups": { "user-group/repo": "group.none" },
+             "user_groups": { "user_group_name": "usergroup.read" }
+           },
+           "user_id": 32,
+           "username": "username"
+         }
+       }
+
+
+get_user_locks 
+--------------
+
+.. py:function:: get_user_locks(apiuser, userid=<Optional:<OptionalAttr:apiuser>>)
+
+   Displays all repositories locked by the specified user.
+
+   * If this command is run by a non-admin user, it returns
+     a list of |repos| locked by that user.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param userid: Sets the userid whose list of locked |repos| will be
+       displayed.
+   :type userid: Optional(str or int)
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result : {
+           [repo_object, repo_object,...]
+       }
+       error :  null
+
+
+get_users 
+---------
+
+.. py:function:: get_users(apiuser)
+
+   Lists all users in the |RCE| user database.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+           result: [<user_object>, ...]
+       error:  null
+
+
+update_user 
+-----------
+
+.. py:function:: update_user(apiuser, userid, username=<Optional:None>, email=<Optional:None>, password=<Optional:None>, firstname=<Optional:None>, lastname=<Optional:None>, active=<Optional:None>, admin=<Optional:None>, extern_type=<Optional:None>, extern_name=<Optional:None>)
+
+   Updates the details for the specified user, if that user exists.
+
+   This command can only be run using an |authtoken| with admin rights to
+   the specified repository.
+
+   This command takes the following options:
+
+   :param apiuser: This is filled automatically from |authtoken|.
+   :type apiuser: AuthUser
+   :param userid: Set the ``userid`` to update.
+   :type userid: str or int
+   :param username: Set the new username.
+   :type username: str or int
+   :param email: Set the new email.
+   :type email: str
+   :param password: Set the new password.
+   :type password: Optional(str)
+   :param firstname: Set the new first name.
+   :type firstname: Optional(str)
+   :param lastname: Set the new surname.
+   :type lastname: Optional(str)
+   :param active: Set the new user as active.
+   :type active: Optional(``True`` | ``False``)
+   :param admin: Give the user admin rights.
+   :type admin: Optional(``True`` | ``False``)
+   :param extern_name: Set the authentication plugin user name.
+       Using LDAP this is filled with LDAP UID.
+   :type extern_name: Optional(str)
+   :param extern_type: Set the authentication plugin type.
+   :type extern_type: Optional(str)
+
+
+   Example output:
+
+   .. code-block:: bash
+
+       id : <id_given_in_input>
+       result: {
+                 "msg" : "updated user ID:<userid> <username>",
+                 "user": <user_object>,
+               }
+       error:  null
+
+   Example error output:
+
+   .. code-block:: bash
+
+     id : <id_given_in_input>
+     result : null
+     error :  {
+       "failed to update user `<username>`"
+     }
+
+

docs/extensions/extensions-hooks.rst

@@ -0,0 +1,25 b''
+.. _extensions-hooks-ref:
+
+Extensions & Hooks
+==================
+
+The extensions & hooks section references three concepts regularly,
+so to clarify what is meant each time, read the following definitions:
+
+* **Plugin**: A Plugin is software that adds a specific feature to
+  an existing software application.
+* **Extension**: An extension extends the capabilities of,
+  or the data available to, an existing software application.
+* **Hook**: A hook intercepts function calls, messages, or events passed
+  between software components and can be used to trigger plugins, or their
+  extensions.
+
+.. toctree::
+
+   rcx
+   install-ext
+   config-ext
+   extensions
+   hooks
+   full-blown-example
+   int-slack

docs/integrations/email.rst

@@ -0,0 +1,23 b''
+.. _integrations-email:
+
+Email integration
+=================
+
+The email integration allows you to send the summary of repo pushes to a
+list of email recipients in the format:
+
+An example::
+
+    User: johndoe
+    Branches: default
+    Repository: http://rhodecode.company.com/repo
+    Commit: 8eab60a44a612e331edfcd59b8d96b2f6a935cd9
+    URL: http://rhodecode.company.com/repo/changeset/8eab60a44a612e331edfcd59b8d96b2f6a935cd9
+    Author: John Doe
+    Date: 2016-03-01 11:20:44
+    Commit Message:
+
+    fixed bug with thing
+
+
+To create one, create a ``email`` integration in `creating-integrations`.

docs/integrations/hipchat.rst

@@ -0,0 +1,14 b''
+.. _integrations-hipchat:
+
+Hipchat integration
+===================
+
+In order to set a Hipchat integration up, it is necessary to obtain the Hipchat
+service url by:
+
+1. Log into Hipchat (https://your-hipchat.hipchat.com/)
+2. Go to *Integrations* -> *Build your own*
+3. Select a room to post notifications to and save it
+
+Hipchat will create a URL for you to use in your integration as outlined in
+:ref:`creating-integrations`.
  No newline at end of file

docs/integrations/jira.rst

@@ -0,0 +1,27 b''
+.. _integrations-jira:
+
+JIRA integration
+================
+
+.. important::
+
+    JIRA integration is only available in |RCEE|.
+
+
+.. important::
+
+    In order to make issue numbers clickable in commit messages, see the
+    :ref:`rhodecode-issue-trackers-ref` section. The JIRA integration
+    only deals with altering JIRA issues.
+
+
+The JIRA integration allows you to reference and change issue statuses in
+JIRA directly from commit messages using commit message patterns such as
+``fixes #JIRA-235`` in order to change the status of issue JIRA-235 to
+eg. "Resolved".
+
+In order to apply a status to a JIRA issue, it is necessary to find the
+transition status id in the *Workflow* section of JIRA.
+
+Once you have the transition status id, you can create a JIRA integration
+as outlined in :ref:`creating-integrations`.

docs/integrations/redmine.rst

@@ -0,0 +1,28 b''
+.. _integrations-redmine:
+
+Redmine integration
+===================
+
+.. important::
+
+    Redmine integration is only available in |RCEE|.
+
+
+.. important::
+
+    In order to make issue numbers clickable in commit messages, see the section
+    :ref:`rhodecode-issue-trackers-ref`. Redmine integration is specifically for
+    altering Redmine issues.
+
+
+Redmine integration allows you to reference and change issue statuses in
+Redmine directly from commit messages, using commit message patterns such as
+``fixes #235`` in order to change the status of issue 235 to eg. "Resolved".
+
+To set a Redmine integration up, it is first necessary to obtain a Redmine API
+key. This can be found under *My Account* in the Redmine application.
+You may have to enable API Access in Redmine settings if it is not already
+available.
+
+Once you have the API key, create a Redmine integration as outlined in
+:ref:`creating-integrations`.

docs/integrations/slack.rst

@@ -0,0 +1,21 b''
+.. _integrations-slack:
+
+Slack integration
+=================
+
+To set a Slack integration up, it is first necessary to set up a Slack webhook
+API endpoint for your Slack channel. This can be done at:
+
+https://my.slack.com/services/new/incoming-webhook/
+
+Select the channel you would like to use, and Slack will provide you with the
+webhook URL for configuration.
+
+You can now create a Slack integration as outlined in
+:ref:`creating-integrations`.
+
+.. note::
+    Some settings in the RhodeCode admin are identical to the options within the
+    Slack integration. For example, if notifications are to be sent in a private
+    chat, leave the "Channel" field blank. Likewise, the Emoji option within
+    RhodeCode can override the one set in the Slack admin.
  No newline at end of file

docs/integrations/webhook.rst

@@ -0,0 +1,12 b''
+.. _integrations-webhook:
+
+Webhook integration
+===================
+
+The Webhook integration allows you to POST events such as repository pushes
+or pull requests to a custom http endpoint as a json dict with details of the
+event.
+
+To create a webhook integration, select "webhook" in the integration settings
+and use the url and key from your custom webhook. See
+:ref:`creating-integrations` for additional instructions.
  No newline at end of file

docs/release-notes/release-notes-4.3.0.rst

@@ -0,0 +1,121 b''
+|RCE| 4.3.0 |RNS|
+-----------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2016-08-12
+
+
+General
+^^^^^^^
+
+- Subversion: detect requests also based on magic path.
+  This adds subversion 1.9 support for SVN backend.
+- Summary/changelog: unified how data is displayed for those pages.
+    * use consistent order of columns
+    * fix the link to commit status
+    * fix order of displaying comments
+- Live-chat: refactor live chat system for code review based on
+  latest channelstream changes.
+- SVN: Add template to generate the apache mod_dav_svn config for all
+  repository groups. Repository groups can now be automatically mapped to be
+  supported by SVN backend. Set `svn.proxy.generate_config = true` and similar
+  options found inside .ini config.
+- Readme/markup: improved order of generating readme files. Fixes #4050
+    * we now use order based on default system renderer
+    * having multiple readme files will pick correct one as set renderer
+- Api: add a max_file_bytes parameter to get_nodes so that large files
+  can be skipped.
+- Auth-ldap: added flag to set debug mode for LDAP connections.
+- Labs: moved rebase-merge option from labs settings into VCS settings.
+- System: send platform type and version to upgrade endpoint when checking
+  for new versions.
+- Packaging: update rhodecode-tools from 0.8.3 to 0.10.0
+- Packaging: update codemirror from 5.4.0 to 5.11.0
+- Packaging: updated pygments to 2.1.3
+- Packaging: bumped supervisor to 3.3.0
+- Packaging: bumped psycopg2 to 2.6.1
+- Packaging: bumped mercurial to 3.8.4
+
+
+New Features
+^^^^^^^^^^^^
+
+- Integrations: created new event based integration framework.
+  Allows to configure global, or per repo: Slack, Hipchat, Webhooks, Email
+  integrations. This also deprecated usage of rcextensions for those.
+- Integrations (EE only): added smart commits for Jira and Redmine with
+  ability to map keywords into issue tracker actions.
+  `Fixes #123 -> resolves issues`, `Closes #123 -> closes issue` etc.
+- Markdown: added improved support for Github flavored markdown.
+- Labs: enable labs setting by default. Labs are new experimental features in
+  RhodeCode that can be used to test new upcomming features.
+- Api: Add api methods to get/set repository settings, implements #4021.
+- Gravatars: commit emails are now displayed based on the actual email
+  used inside commit rather then the main one of associated account
+  inside RhodeCode, #4037.
+- Emails: All emails got new styling. They look now consistent
+  to UI of application. We also added bunch of usefull information into
+  email body, #4087.
+- Pull requests: add show/hide comment functionality inside diffs, #4106.
+- Notifications: added real-time notifications with via channelstream
+  about new comments when reviewing the code. Never miss someone replies
+  onto comments you submitted while doing a code-review.
+
+
+Security
+^^^^^^^^
+
+- Api: make `comment_commits` api call have consistent permissions
+  with web interface.
+- Files: fixes display of "Add File" button missing or present despite
+  permissions, because of cached version of the page was rendered, fixes #4083.
+- Login/Registration: fixed flash message problem on login/registration
+  pages, fixes #4043.
+- Auth-token: allow other authentication types to use auth-token.
+  Accounts associated with other types like LDAP, or PAM can
+  now use auth-tokens to authenticate via RhodeCode.
+
+
+Performance
+^^^^^^^^^^^
+
+- Core: made all RhodeCode components gevent compatible. RhodeCode can now make
+  use of async workers. You can handle dozens of concurrent operations using a
+  single worker. This works only with new HTTP backend.
+- Core: added new very efficient HTTP backend can be used to replace pyro4.
+- Core: Set 'gzip_responses' to false by default. We no longer require any
+  gzip computations on backed, thus speeding up large file transfers.
+- UI: optimized events system for JavaScript to boost performance on
+  large html pages.
+- VCS: moved VCSMiddleware up to pyramid layer as wrapper around pylons app.
+  Skips few calls, and allows slightly faster clones/pulls and pushes.
+
+
+Fixes
+^^^^^
+
+- VCS: add vcsserver cache invalidation to mercurial backend.
+  Fixes multi-process problems after Mercurial 3.8.X release with server
+  side merges.
+- VCS: clear caches on remap-and-rescan option.
+- VCS: improved logic of updating commit caches in cases of rebases.
+- Caches: Add an argument to make the cache context thread scoped. Brings
+  support to gevent compatible handling.
+- Diff2way: fixed unicode problem on non-ascii files.
+- Full text search: whoosh schema uses now bigger ints, fixes #4035
+- File-browser: optimized cached tree calculation, reduced load times by
+  50% on complex file trees.
+- Styling: #4086 fixing bug where long commit messages did not wrap in file view.
+- SVN: Ignore the content length header from response, fixes #4112.
+  Fixes the "svn: E120106: ra_serf: The server sent a truncated HTTP response body."
+- Auth: Fix password_changed function, fixes #4043.
+- UI/tables: better message when tables are empty #685 #1832.
+- UX: put gravatar and username together in user list #3203.
+- Gists: use colander schema to validate input data.
+    * brings consistent validation acros API and web
+    * use nicer and stricter schemas to validate data
+    * fixes #4118
+- Appenlight: error reporting can now also report VCSMiddleware errors.
+- Users: hash email key for User.get_by_email() fixes #4132

licenses/tornado_license.txt

@@ -0,0 +1,13 b''
+# Copyright 2009 Facebook
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.

rhodecode/channelstream/__init__.py

@@ -0,0 +1,79 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import os
+
+from pyramid.settings import asbool
+
+from rhodecode.config.routing import ADMIN_PREFIX
+from rhodecode.lib.ext_json import json
+
+
+def url_gen(request):
+    urls = {
+        'connect': request.route_url('channelstream_connect'),
+        'subscribe': request.route_url('channelstream_subscribe')
+    }
+    return json.dumps(urls)
+
+
+PLUGIN_DEFINITION = {
+    'name': 'channelstream',
+    'config': {
+        'javascript': [],
+        'css': [],
+        'template_hooks': {
+            'plugin_init_template': 'rhodecode:templates/channelstream/plugin_init.html'
+        },
+        'url_gen': url_gen,
+        'static': None,
+        'enabled': False,
+        'server': '',
+        'secret': ''
+    }
+}
+
+
+def includeme(config):
+    settings = config.registry.settings
+    PLUGIN_DEFINITION['config']['enabled'] = asbool(
+        settings.get('channelstream.enabled'))
+    PLUGIN_DEFINITION['config']['server'] = settings.get(
+        'channelstream.server', '')
+    PLUGIN_DEFINITION['config']['secret'] = settings.get(
+        'channelstream.secret', '')
+    PLUGIN_DEFINITION['config']['history.location'] = settings.get(
+        'channelstream.history.location', '')
+    config.register_rhodecode_plugin(
+        PLUGIN_DEFINITION['name'],
+        PLUGIN_DEFINITION['config']
+    )
+    # create plugin history location
+    history_dir = PLUGIN_DEFINITION['config']['history.location']
+    if history_dir and not os.path.exists(history_dir):
+        os.makedirs(history_dir, 0750)
+
+    config.add_route(
+        name='channelstream_connect',
+        pattern=ADMIN_PREFIX + '/channelstream/connect')
+    config.add_route(
+        name='channelstream_subscribe',
+        pattern=ADMIN_PREFIX + '/channelstream/subscribe')
+    config.scan('rhodecode.channelstream')

rhodecode/channelstream/views.py

@@ -0,0 +1,177 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+"""
+Channel Stream controller for rhodecode
+
+:created_on: Oct 10, 2015
+:author: marcinl
+:copyright: (c) 2013-2015 RhodeCode GmbH.
+:license: Commercial License, see LICENSE for more details.
+"""
+
+import logging
+import uuid
+
+from pylons import tmpl_context as c
+from pyramid.settings import asbool
+from pyramid.view import view_config
+from webob.exc import HTTPBadRequest, HTTPForbidden, HTTPBadGateway
+
+from rhodecode.lib.channelstream import (
+    channelstream_request,
+    ChannelstreamConnectionException,
+    ChannelstreamPermissionException,
+    check_channel_permissions,
+    get_connection_validators,
+    get_user_data,
+    parse_channels_info,
+    update_history_from_logs,
+    STATE_PUBLIC_KEYS)
+from rhodecode.lib.auth import NotAnonymous
+from rhodecode.lib.utils2 import str2bool
+
+log = logging.getLogger(__name__)
+
+
+class ChannelstreamView(object):
+    def __init__(self, context, request):
+        self.context = context
+        self.request = request
+
+        # Some of the decorators rely on this attribute to be present
+        # on the class of the decorated method.
+        self._rhodecode_user = request.user
+        registry = request.registry
+        self.channelstream_config = registry.rhodecode_plugins['channelstream']
+        if not self.channelstream_config.get('enabled'):
+            log.exception('Channelstream plugin is disabled')
+            raise HTTPBadRequest()
+
+    @NotAnonymous()
+    @view_config(route_name='channelstream_connect', renderer='json')
+    def connect(self):
+        """ handle authorization of users trying to connect """
+        try:
+            json_body = self.request.json_body
+        except Exception:
+            log.exception('Failed to decode json from request')
+            raise HTTPBadRequest()
+        try:
+            channels = check_channel_permissions(
+                json_body.get('channels'),
+                get_connection_validators(self.request.registry))
+        except ChannelstreamPermissionException:
+            log.error('Incorrect permissions for requested channels')
+            raise HTTPForbidden()
+
+        user = c.rhodecode_user
+        if user.user_id:
+            user_data = get_user_data(user.user_id)
+        else:
+            user_data = {
+                'id': None,
+                'username': None,
+                'first_name': None,
+                'last_name': None,
+                'icon_link': None,
+                'display_name': None,
+                'display_link': None,
+            }
+        payload = {
+            'username': user.username,
+            'user_state': user_data,
+            'conn_id': str(uuid.uuid4()),
+            'channels': channels,
+            'channel_configs': {},
+            'state_public_keys': STATE_PUBLIC_KEYS,
+            'info': {
+                'exclude_channels': ['broadcast']
+            }
+        }
+        filtered_channels = [channel for channel in channels
+                             if channel != 'broadcast']
+        for channel in filtered_channels:
+            payload['channel_configs'][channel] = {
+                'notify_presence': True,
+                'history_size': 100,
+                'store_history': True,
+                'broadcast_presence_with_user_lists': True
+            }
+        # connect user to server
+        try:
+            connect_result = channelstream_request(self.channelstream_config,
+                                                   payload, '/connect')
+        except ChannelstreamConnectionException:
+            log.exception('Channelstream service is down')
+            return HTTPBadGateway()
+
+        connect_result['channels'] = channels
+        connect_result['channels_info'] = parse_channels_info(
+            connect_result['channels_info'],
+            include_channel_info=filtered_channels)
+        update_history_from_logs(self.channelstream_config,
+                                 filtered_channels, connect_result)
+        return connect_result
+
+    @NotAnonymous()
+    @view_config(route_name='channelstream_subscribe', renderer='json')
+    def subscribe(self):
+        """ can be used to subscribe specific connection to other channels """
+        try:
+            json_body = self.request.json_body
+        except Exception:
+            log.exception('Failed to decode json from request')
+            raise HTTPBadRequest()
+        try:
+            channels = check_channel_permissions(
+                json_body.get('channels'),
+                get_connection_validators(self.request.registry))
+        except ChannelstreamPermissionException:
+            log.error('Incorrect permissions for requested channels')
+            raise HTTPForbidden()
+        payload = {'conn_id': json_body.get('conn_id', ''),
+                   'channels': channels,
+                   'channel_configs': {},
+                   'info': {
+                       'exclude_channels': ['broadcast']}
+                   }
+        filtered_channels = [chan for chan in channels if chan != 'broadcast']
+        for channel in filtered_channels:
+            payload['channel_configs'][channel] = {
+                'notify_presence': True,
+                'history_size': 100,
+                'store_history': True,
+                'broadcast_presence_with_user_lists': True
+            }
+        try:
+            connect_result = channelstream_request(
+                self.channelstream_config, payload, '/subscribe')
+        except ChannelstreamConnectionException:
+            log.exception('Channelstream service is down')
+            return HTTPBadGateway()
+        # include_channel_info will limit history only to new channel
+        # to not overwrite histories on other channels in client
+        connect_result['channels_info'] = parse_channels_info(
+            connect_result['channels_info'],
+            include_channel_info=filtered_channels)
+        update_history_from_logs(self.channelstream_config,
+                                 filtered_channels, connect_result)
+        return connect_result

rhodecode/events/__init__.py

@@ -0,0 +1,78 b''
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+from pyramid.threadlocal import get_current_registry
+
+log = logging.getLogger(__name__)
+
+
+def trigger(event, registry=None):
+    """
+    Helper method to send an event. This wraps the pyramid logic to send an
+    event.
+    """
+    # For the first step we are using pyramids thread locals here. If the
+    # event mechanism works out as a good solution we should think about
+    # passing the registry as an argument to get rid of it.
+    registry = registry or get_current_registry()
+    registry.notify(event)
+    log.debug('event %s triggered', event)
+
+    # Until we can work around the problem that VCS operations do not have a
+    # pyramid context to work with, we send the events to integrations directly
+
+    # Later it will be possible to use regular pyramid subscribers ie:
+    #   config.add_subscriber(integrations_event_handler, RhodecodeEvent)
+    from rhodecode.integrations import integrations_event_handler
+    if isinstance(event, RhodecodeEvent):
+        integrations_event_handler(event)
+
+
+from rhodecode.events.base import RhodecodeEvent
+
+from rhodecode.events.user import (  # noqa
+    UserPreCreate,
+    UserPreUpdate,
+    UserRegistered
+)
+
+from rhodecode.events.repo import (  # noqa
+    RepoEvent,
+    RepoPreCreateEvent, RepoCreateEvent,
+    RepoPreDeleteEvent, RepoDeleteEvent,
+    RepoPrePushEvent,   RepoPushEvent,
+    RepoPrePullEvent,   RepoPullEvent,
+)
+
+from rhodecode.events.repo_group import (  # noqa
+    RepoGroupEvent,
+    RepoGroupCreateEvent,
+    RepoGroupUpdateEvent,
+    RepoGroupDeleteEvent,
+)
+
+from rhodecode.events.pullrequest import (  # noqa
+    PullRequestEvent,
+    PullRequestCreateEvent,
+    PullRequestUpdateEvent,
+    PullRequestCommentEvent,
+    PullRequestReviewEvent,
+    PullRequestMergeEvent,
+    PullRequestCloseEvent,
+)

rhodecode/events/base.py

@@ -0,0 +1,69 b''
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+from datetime import datetime
+from pyramid.threadlocal import get_current_request
+from rhodecode.lib.utils2 import AttributeDict
+
+
+# this is a user object to be used for events caused by the system (eg. shell)
+SYSTEM_USER = AttributeDict(dict(
+    username='__SYSTEM__'
+))
+
+
+class RhodecodeEvent(object):
+    """
+    Base event class for all Rhodecode events
+    """
+    name = "RhodeCodeEvent"
+
+    def __init__(self):
+        self.request = get_current_request()
+        self.utc_timestamp = datetime.utcnow()
+
+    @property
+    def actor(self):
+        if self.request:
+            return self.request.user.get_instance()
+        return SYSTEM_USER
+
+    @property
+    def actor_ip(self):
+        if self.request:
+            return self.request.user.ip_addr
+        return '<no ip available>'
+
+    @property
+    def server_url(self):
+        if self.request:
+            from rhodecode.lib import helpers as h
+            return h.url('home', qualified=True)
+        return '<no server_url available>'
+
+    def as_dict(self):
+        data = {
+            'name': self.name,
+            'utc_timestamp': self.utc_timestamp,
+            'actor_ip': self.actor_ip,
+            'actor': {
+                'username': self.actor.username
+            },
+            'server_url': self.server_url
+        }
+        return data

rhodecode/events/pullrequest.py

@@ -0,0 +1,131 b''
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+from rhodecode.translation import lazy_ugettext
+from rhodecode.events.repo import (
+    RepoEvent, _commits_as_dict, _issues_as_dict)
+
+
+class PullRequestEvent(RepoEvent):
+    """
+    Base class for pull request events.
+
+    :param pullrequest: a :class:`PullRequest` instance
+    """
+
+    def __init__(self, pullrequest):
+        super(PullRequestEvent, self).__init__(pullrequest.target_repo)
+        self.pullrequest = pullrequest
+
+    def as_dict(self):
+        from rhodecode.model.pull_request import PullRequestModel
+        data = super(PullRequestEvent, self).as_dict()
+
+        commits = _commits_as_dict(
+            commit_ids=self.pullrequest.revisions,
+            repos=[self.pullrequest.source_repo]
+        )
+        issues = _issues_as_dict(commits)
+
+        data.update({
+            'pullrequest': {
+                'title': self.pullrequest.title,
+                'issues': issues,
+                'pull_request_id': self.pullrequest.pull_request_id,
+                'url': PullRequestModel().get_url(self.pullrequest),
+                'status': self.pullrequest.calculated_review_status(),
+                'commits': commits,
+            }
+        })
+        return data
+
+
+class PullRequestCreateEvent(PullRequestEvent):
+    """
+    An instance of this class is emitted as an :term:`event` after a pull
+    request is created.
+    """
+    name = 'pullrequest-create'
+    display_name = lazy_ugettext('pullrequest created')
+
+
+class PullRequestCloseEvent(PullRequestEvent):
+    """
+    An instance of this class is emitted as an :term:`event` after a pull
+    request is closed.
+    """
+    name = 'pullrequest-close'
+    display_name = lazy_ugettext('pullrequest closed')
+
+
+class PullRequestUpdateEvent(PullRequestEvent):
+    """
+    An instance of this class is emitted as an :term:`event` after a pull
+    request's commits have been updated.
+    """
+    name = 'pullrequest-update'
+    display_name = lazy_ugettext('pullrequest commits updated')
+
+
+class PullRequestReviewEvent(PullRequestEvent):
+    """
+    An instance of this class is emitted as an :term:`event` after a pull
+    request review has changed.
+    """
+    name = 'pullrequest-review'
+    display_name = lazy_ugettext('pullrequest review changed')
+
+
+class PullRequestMergeEvent(PullRequestEvent):
+    """
+    An instance of this class is emitted as an :term:`event` after a pull
+    request is merged.
+    """
+    name = 'pullrequest-merge'
+    display_name = lazy_ugettext('pullrequest merged')
+
+
+class PullRequestCommentEvent(PullRequestEvent):
+    """
+    An instance of this class is emitted as an :term:`event` after a pull
+    request comment is created.
+    """
+    name = 'pullrequest-comment'
+    display_name = lazy_ugettext('pullrequest commented')
+
+    def __init__(self, pullrequest, comment):
+        super(PullRequestCommentEvent, self).__init__(pullrequest)
+        self.comment = comment
+
+    def as_dict(self):
+        from rhodecode.model.comment import ChangesetCommentsModel
+        data = super(PullRequestCommentEvent, self).as_dict()
+
+        status = None
+        if self.comment.status_change:
+            status = self.comment.status_change[0].status
+
+        data.update({
+            'comment': {
+                'status': status,
+                'text': self.comment.text,
+                'url': ChangesetCommentsModel().get_url(self.comment)
+            }
+        })
+        return data

rhodecode/events/repo.py

@@ -0,0 +1,257 b''
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+
+from rhodecode.translation import lazy_ugettext
+from rhodecode.model.db import User, Repository, Session
+from rhodecode.events.base import RhodecodeEvent
+from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError
+
+log = logging.getLogger(__name__)
+
+def _commits_as_dict(commit_ids, repos):
+    """
+    Helper function to serialize commit_ids
+
+    :param commit_ids: commits to get
+    :param repos: list of repos to check
+    """
+    from rhodecode.lib.utils2 import extract_mentioned_users
+    from rhodecode.model.db import Repository
+    from rhodecode.lib import helpers as h
+    from rhodecode.lib.helpers import process_patterns
+    from rhodecode.lib.helpers import urlify_commit_message
+
+    if not repos:
+        raise Exception('no repo defined')
+
+    if not isinstance(repos, (tuple, list)):
+        repos = [repos]
+
+    if not commit_ids:
+        return []
+
+    needed_commits = set(commit_ids)
+
+    commits = []
+    reviewers = []
+    for repo in repos:
+        if not needed_commits:
+            return commits # return early if we have the commits we need
+
+        vcs_repo = repo.scm_instance(cache=False)
+        try:
+            for commit_id in list(needed_commits):
+                try:
+                    cs = vcs_repo.get_changeset(commit_id)
+                except CommitDoesNotExistError:
+                    continue # maybe its in next repo
+
+                cs_data = cs.__json__()
+                cs_data['mentions'] = extract_mentioned_users(cs_data['message'])
+                cs_data['reviewers'] = reviewers
+                cs_data['url'] = h.url('changeset_home',
+                    repo_name=repo.repo_name,
+                    revision=cs_data['raw_id'],
+                    qualified=True
+                )
+                urlified_message, issues_data = process_patterns(
+                    cs_data['message'], repo.repo_name)
+                cs_data['issues'] = issues_data
+                cs_data['message_html'] = urlify_commit_message(cs_data['message'],
+                    repo.repo_name)
+                commits.append(cs_data)
+
+                needed_commits.discard(commit_id)
+
+        except Exception as e:
+            log.exception(e)
+            # we don't send any commits when crash happens, only full list matters
+            # we short circuit then.
+            return []
+
+    missing_commits = set(commit_ids) - set(c['raw_id'] for c in commits)
+    if missing_commits:
+        log.error('missing commits: %s' % ', '.join(missing_commits))
+
+    return commits
+
+
+def _issues_as_dict(commits):
+    """ Helper function to serialize issues from commits """
+    issues = {}
+    for commit in commits:
+        for issue in commit['issues']:
+            issues[issue['id']] = issue
+    return issues
+
+class RepoEvent(RhodecodeEvent):
+    """
+    Base class for events acting on a repository.
+
+    :param repo: a :class:`Repository` instance
+    """
+
+    def __init__(self, repo):
+        super(RepoEvent, self).__init__()
+        self.repo = repo
+
+    def as_dict(self):
+        from rhodecode.model.repo import RepoModel
+        data = super(RepoEvent, self).as_dict()
+        data.update({
+            'repo': {
+                'repo_id': self.repo.repo_id,
+                'repo_name': self.repo.repo_name,
+                'repo_type': self.repo.repo_type,
+                'url': RepoModel().get_url(self.repo)
+            }
+        })
+        return data
+
+
+class RepoPreCreateEvent(RepoEvent):
+    """
+    An instance of this class is emitted as an :term:`event` before a repo is
+    created.
+    """
+    name = 'repo-pre-create'
+    display_name = lazy_ugettext('repository pre create')
+
+
+class RepoCreateEvent(RepoEvent):
+    """
+    An instance of this class is emitted as an :term:`event` whenever a repo is
+    created.
+    """
+    name = 'repo-create'
+    display_name = lazy_ugettext('repository created')
+
+
+class RepoPreDeleteEvent(RepoEvent):
+    """
+    An instance of this class is emitted as an :term:`event` whenever a repo is
+    created.
+    """
+    name = 'repo-pre-delete'
+    display_name = lazy_ugettext('repository pre delete')
+
+
+class RepoDeleteEvent(RepoEvent):
+    """
+    An instance of this class is emitted as an :term:`event` whenever a repo is
+    created.
+    """
+    name = 'repo-delete'
+    display_name = lazy_ugettext('repository deleted')
+
+
+class RepoVCSEvent(RepoEvent):
+    """
+    Base class for events triggered by the VCS
+    """
+    def __init__(self, repo_name, extras):
+        self.repo = Repository.get_by_repo_name(repo_name)
+        if not self.repo:
+            raise Exception('repo by this name %s does not exist' % repo_name)
+        self.extras = extras
+        super(RepoVCSEvent, self).__init__(self.repo)
+
+    @property
+    def actor(self):
+        if self.extras.get('username'):
+            return User.get_by_username(self.extras['username'])
+
+    @property
+    def actor_ip(self):
+        if self.extras.get('ip'):
+            return self.extras['ip']
+
+    @property
+    def server_url(self):
+        if self.extras.get('server_url'):
+            return self.extras['server_url']
+
+
+class RepoPrePullEvent(RepoVCSEvent):
+    """
+    An instance of this class is emitted as an :term:`event` before commits
+    are pulled from a repo.
+    """
+    name = 'repo-pre-pull'
+    display_name = lazy_ugettext('repository pre pull')
+
+
+class RepoPullEvent(RepoVCSEvent):
+    """
+    An instance of this class is emitted as an :term:`event` after commits
+    are pulled from a repo.
+    """
+    name = 'repo-pull'
+    display_name = lazy_ugettext('repository pull')
+
+
+class RepoPrePushEvent(RepoVCSEvent):
+    """
+    An instance of this class is emitted as an :term:`event` before commits
+    are pushed to a repo.
+    """
+    name = 'repo-pre-push'
+    display_name = lazy_ugettext('repository pre push')
+
+
+class RepoPushEvent(RepoVCSEvent):
+    """
+    An instance of this class is emitted as an :term:`event` after commits
+    are pushed to a repo.
+
+    :param extras: (optional) dict of data from proxied VCS actions
+    """
+    name = 'repo-push'
+    display_name = lazy_ugettext('repository push')
+
+    def __init__(self, repo_name, pushed_commit_ids, extras):
+        super(RepoPushEvent, self).__init__(repo_name, extras)
+        self.pushed_commit_ids = pushed_commit_ids
+
+    def as_dict(self):
+        data = super(RepoPushEvent, self).as_dict()
+        branch_url = repo_url = data['repo']['url']
+
+        commits = _commits_as_dict(
+            commit_ids=self.pushed_commit_ids, repos=[self.repo])
+        issues = _issues_as_dict(commits)
+
+        branches = set(
+            commit['branch'] for commit in commits if commit['branch'])
+        branches = [
+            {
+                'name': branch,
+                'url': '{}/changelog?branch={}'.format(
+                    data['repo']['url'], branch)
+            }
+            for branch in branches
+        ]
+
+        data['push'] = {
+            'commits': commits,
+            'issues': issues,
+            'branches': branches,
+        }
+        return data

rhodecode/events/repo_group.py

@@ -0,0 +1,80 b''
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+
+from rhodecode.translation import lazy_ugettext
+from rhodecode.events.base import RhodecodeEvent
+
+
+log = logging.getLogger(__name__)
+
+
+class RepoGroupEvent(RhodecodeEvent):
+    """
+    Base class for events acting on a repository group.
+
+    :param repo: a :class:`RepositoryGroup` instance
+    """
+
+    def __init__(self, repo_group):
+        super(RepoGroupEvent, self).__init__()
+        self.repo_group = repo_group
+
+    def as_dict(self):
+        data = super(RepoGroupEvent, self).as_dict()
+        data.update({
+            'repo_group': {
+                'group_id': self.repo_group.group_id,
+                'group_name': self.repo_group.group_name,
+                'group_parent_id': self.repo_group.group_parent_id,
+                'group_description': self.repo_group.group_description,
+                'user_id': self.repo_group.user_id,
+                'created_by': self.repo_group.user.username,
+                'created_on': self.repo_group.created_on,
+                'enable_locking': self.repo_group.enable_locking,
+            }
+        })
+        return data
+
+
+class RepoGroupCreateEvent(RepoGroupEvent):
+    """
+    An instance of this class is emitted as an :term:`event` whenever a
+    repository group is created.
+    """
+    name = 'repo-group-create'
+    display_name = lazy_ugettext('repository group created')
+
+
+class RepoGroupDeleteEvent(RepoGroupEvent):
+    """
+    An instance of this class is emitted as an :term:`event` whenever a
+    repository group is deleted.
+    """
+    name = 'repo-group-delete'
+    display_name = lazy_ugettext('repository group deleted')
+
+
+class RepoGroupUpdateEvent(RepoGroupEvent):
+    """
+    An instance of this class is emitted as an :term:`event` whenever a
+    repository group is updated.
+    """
+    name = 'repo-group-update'
+    display_name = lazy_ugettext('repository group update')

rhodecode/integrations/__init__.py

@@ -0,0 +1,62 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2012-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+
+from rhodecode.integrations.registry import IntegrationTypeRegistry
+from rhodecode.integrations.types import webhook, slack, hipchat, email
+
+log = logging.getLogger(__name__)
+
+
+# TODO: dan: This is currently global until we figure out what to do about
+# VCS's not having a pyramid context - move it to pyramid app configuration
+# includeme level later to allow per instance integration setup
+integration_type_registry = IntegrationTypeRegistry()
+
+integration_type_registry.register_integration_type(
+    webhook.WebhookIntegrationType)
+integration_type_registry.register_integration_type(
+    slack.SlackIntegrationType)
+integration_type_registry.register_integration_type(
+    hipchat.HipchatIntegrationType)
+integration_type_registry.register_integration_type(
+    email.EmailIntegrationType)
+
+
+def integrations_event_handler(event):
+    """
+    Takes an event and passes it to all enabled integrations
+    """
+    from rhodecode.model.integration import IntegrationModel
+
+    integration_model = IntegrationModel()
+    integrations = integration_model.get_for_event(event)
+    for integration in integrations:
+        try:
+            integration_model.send_event(integration, event)
+        except Exception:
+            log.exception(
+                'failure occured when sending event %s to integration %s' % (
+                    event, integration))
+
+
+def includeme(config):
+    config.include('rhodecode.integrations.routes')

rhodecode/integrations/registry.py

@@ -0,0 +1,37 b''
+# -*- coding: utf-8 -*-
+# Copyright (C) 2012-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+
+log = logging.getLogger(__name__)
+
+
+class IntegrationTypeRegistry(dict):
+    """
+    Registry Class to hold IntegrationTypes
+    """
+    def register_integration_type(self, IntegrationType):
+        key = IntegrationType.key
+        if key in self:
+            log.warning(
+                'Overriding existing integration type %s (%s) with %s' % (
+                    self[key], key, IntegrationType))
+
+        self[key] = IntegrationType
+

rhodecode/integrations/routes.py

@@ -0,0 +1,133 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2012-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+
+from rhodecode.model.db import Repository, Integration
+from rhodecode.config.routing import (
+    ADMIN_PREFIX, add_route_requirements, URL_NAME_REQUIREMENTS)
+from rhodecode.integrations import integration_type_registry
+
+log = logging.getLogger(__name__)
+
+
+def includeme(config):
+    config.add_route('global_integrations_home',
+                     ADMIN_PREFIX + '/integrations')
+    config.add_route('global_integrations_list',
+                     ADMIN_PREFIX + '/integrations/{integration}')
+    for route_name in ['global_integrations_home', 'global_integrations_list']:
+        config.add_view('rhodecode.integrations.views.GlobalIntegrationsView',
+                        attr='index',
+                        renderer='rhodecode:templates/admin/integrations/list.html',
+                        request_method='GET',
+                        route_name=route_name)
+
+    config.add_route('global_integrations_create',
+                     ADMIN_PREFIX + '/integrations/{integration}/new',
+                     custom_predicates=(valid_integration,))
+    config.add_route('global_integrations_edit',
+                     ADMIN_PREFIX + '/integrations/{integration}/{integration_id}',
+                     custom_predicates=(valid_integration,))
+    for route_name in ['global_integrations_create', 'global_integrations_edit']:
+        config.add_view('rhodecode.integrations.views.GlobalIntegrationsView',
+                        attr='settings_get',
+                        renderer='rhodecode:templates/admin/integrations/edit.html',
+                        request_method='GET',
+                        route_name=route_name)
+        config.add_view('rhodecode.integrations.views.GlobalIntegrationsView',
+                        attr='settings_post',
+                        renderer='rhodecode:templates/admin/integrations/edit.html',
+                        request_method='POST',
+                        route_name=route_name)
+
+    config.add_route('repo_integrations_home',
+                     add_route_requirements(
+                        '{repo_name}/settings/integrations',
+                        URL_NAME_REQUIREMENTS
+                     ),
+                     custom_predicates=(valid_repo,))
+    config.add_route('repo_integrations_list',
+                     add_route_requirements(
+                        '{repo_name}/settings/integrations/{integration}',
+                        URL_NAME_REQUIREMENTS
+                     ),
+                     custom_predicates=(valid_repo, valid_integration))
+    for route_name in ['repo_integrations_home', 'repo_integrations_list']:
+        config.add_view('rhodecode.integrations.views.RepoIntegrationsView',
+                        attr='index',
+                        request_method='GET',
+                        route_name=route_name)
+
+    config.add_route('repo_integrations_create',
+                     add_route_requirements(
+                        '{repo_name}/settings/integrations/{integration}/new',
+                        URL_NAME_REQUIREMENTS
+                     ),
+                     custom_predicates=(valid_repo, valid_integration))
+    config.add_route('repo_integrations_edit',
+                     add_route_requirements(
+                        '{repo_name}/settings/integrations/{integration}/{integration_id}',
+                        URL_NAME_REQUIREMENTS
+                     ),
+                     custom_predicates=(valid_repo, valid_integration))
+    for route_name in ['repo_integrations_edit', 'repo_integrations_create']:
+        config.add_view('rhodecode.integrations.views.RepoIntegrationsView',
+                        attr='settings_get',
+                        renderer='rhodecode:templates/admin/integrations/edit.html',
+                        request_method='GET',
+                        route_name=route_name)
+        config.add_view('rhodecode.integrations.views.RepoIntegrationsView',
+                        attr='settings_post',
+                        renderer='rhodecode:templates/admin/integrations/edit.html',
+                        request_method='POST',
+                        route_name=route_name)
+
+
+def valid_repo(info, request):
+    repo = Repository.get_by_repo_name(info['match']['repo_name'])
+    if repo:
+        return True
+
+
+def valid_integration(info, request):
+    integration_type = info['match']['integration']
+    integration_id = info['match'].get('integration_id')
+    repo_name = info['match'].get('repo_name')
+
+    if integration_type not in integration_type_registry:
+        return False
+
+    repo = None
+    if repo_name:
+        repo = Repository.get_by_repo_name(info['match']['repo_name'])
+        if not repo:
+            return False
+
+    if integration_id:
+        integration = Integration.get(integration_id)
+        if not integration:
+            return False
+        if integration.integration_type != integration_type:
+            return False
+        if repo and repo.repo_id != integration.repo_id:
+            return False
+
+    return True

rhodecode/integrations/schema.py

@@ -0,0 +1,45 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2012-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import colander
+
+from rhodecode.translation import lazy_ugettext
+
+
+class IntegrationSettingsSchemaBase(colander.MappingSchema):
+    """
+    This base schema is intended for use in integrations.
+    It adds a few default settings (e.g., "enabled"), so that integration
+    authors don't have to maintain a bunch of boilerplate.
+    """
+    enabled = colander.SchemaNode(
+        colander.Bool(),
+        default=True,
+        description=lazy_ugettext('Enable or disable this integration.'),
+        missing=False,
+        title=lazy_ugettext('Enabled'),
+    )
+
+    name = colander.SchemaNode(
+        colander.String(),
+        description=lazy_ugettext('Short name for this integration.'),
+        missing=colander.required,
+        title=lazy_ugettext('Integration name'),
+    )

rhodecode/integrations/types/__init__.py

@@ -0,0 +1,19 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2012-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/

rhodecode/integrations/types/base.py

@@ -0,0 +1,42 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2012-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+from rhodecode.integrations.schema import IntegrationSettingsSchemaBase
+
+
+class IntegrationTypeBase(object):
+    """ Base class for IntegrationType plugins """
+
+    def __init__(self, settings):
+        """
+        :param settings: dict of settings to be used for the integration
+        """
+        self.settings = settings
+
+
+    def settings_schema(self):
+        """
+        A colander schema of settings for the integration type
+
+        Subclasses can return their own schema but should always
+        inherit from IntegrationSettingsSchemaBase
+        """
+        return IntegrationSettingsSchemaBase()
+

rhodecode/integrations/types/email.py

@@ -0,0 +1,222 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2012-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+from __future__ import unicode_literals
+import deform
+import logging
+import colander
+
+from mako.template import Template
+
+from rhodecode import events
+from rhodecode.translation import _, lazy_ugettext
+from rhodecode.lib.celerylib import run_task
+from rhodecode.lib.celerylib import tasks
+from rhodecode.integrations.types.base import IntegrationTypeBase
+from rhodecode.integrations.schema import IntegrationSettingsSchemaBase
+
+
+log = logging.getLogger(__name__)
+
+repo_push_template_plaintext = Template('''
+Commits:
+
+% for commit in data['push']['commits']:
+${commit['url']} by ${commit['author']} at ${commit['date']}
+${commit['message']}
+----
+
+% endfor
+''')
+
+## TODO (marcink): think about putting this into a file, or use base.mako email template
+
+repo_push_template_html = Template('''
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <title>${subject}</title>
+    <style type="text/css">
+        /* Based on The MailChimp Reset INLINE: Yes. */
+        #outlook a {padding:0;} /* Force Outlook to provide a "view in browser" menu link. */
+        body{width:100% !important; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; margin:0; padding:0;}
+        /* Prevent Webkit and Windows Mobile platforms from changing default font sizes.*/
+        .ExternalClass {width:100%;} /* Force Hotmail to display emails at full width */
+        .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;}
+        /* Forces Hotmail to display normal line spacing.  More on that: http://www.emailonacid.com/forum/viewthread/43/ */
+        #backgroundTable {margin:0; padding:0; line-height: 100% !important;}
+        /* End reset */
+
+        /* defaults for images*/
+        img {outline:none; text-decoration:none; -ms-interpolation-mode: bicubic;}
+        a img {border:none;}
+        .image_fix {display:block;}
+
+        body {line-height:1.2em;}
+        p {margin: 0 0 20px;}
+        h1, h2, h3, h4, h5, h6 {color:#323232!important;}
+        a {color:#427cc9;text-decoration:none;outline:none;cursor:pointer;}
+        a:focus {outline:none;}
+        a:hover {color: #305b91;}
+        h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {color:#427cc9!important;text-decoration:none!important;}
+        h1 a:active, h2 a:active,  h3 a:active, h4 a:active, h5 a:active, h6 a:active {color: #305b91!important;}
+        h1 a:visited, h2 a:visited,  h3 a:visited, h4 a:visited, h5 a:visited, h6 a:visited {color: #305b91!important;}
+        table {font-size:13px;border-collapse:collapse;mso-table-lspace:0pt;mso-table-rspace:0pt;}
+        table td {padding:.65em 1em .65em 0;border-collapse:collapse;vertical-align:top;text-align:left;}
+        input {display:inline;border-radius:2px;border-style:solid;border: 1px solid #dbd9da;padding:.5em;}
+        input:focus {outline: 1px solid #979797}
+        @media only screen and (-webkit-min-device-pixel-ratio: 2) {
+        /* Put your iPhone 4g styles in here */
+        }
+
+        /* Android targeting */
+        @media only screen and (-webkit-device-pixel-ratio:.75){
+        /* Put CSS for low density (ldpi) Android layouts in here */
+        }
+        @media only screen and (-webkit-device-pixel-ratio:1){
+        /* Put CSS for medium density (mdpi) Android layouts in here */
+        }
+        @media only screen and (-webkit-device-pixel-ratio:1.5){
+        /* Put CSS for high density (hdpi) Android layouts in here */
+        }
+        /* end Android targeting */
+
+    </style>
+
+    <!-- Targeting Windows Mobile -->
+    <!--[if IEMobile 7]>
+    <style type="text/css">
+
+    </style>
+    <![endif]-->
+
+    <!--[if gte mso 9]>
+        <style>
+        /* Target Outlook 2007 and 2010 */
+        </style>
+    <![endif]-->
+</head>
+<body>
+<!-- Wrapper/Container Table: Use a wrapper table to control the width and the background color consistently of your email. Use this approach instead of setting attributes on the body tag. -->
+<table cellpadding="0" cellspacing="0" border="0" id="backgroundTable" align="left" style="margin:1%;width:97%;padding:0;font-family:sans-serif;font-weight:100;border:1px solid #dbd9da">
+    <tr>
+        <td valign="top" style="padding:0;">
+            <table cellpadding="0" cellspacing="0" border="0" align="left" width="100%">
+                <tr><td style="width:100%;padding:7px;background-color:#202020" valign="top">
+                    <a style="color:#eeeeee;text-decoration:none;" href="${instance_url}">
+                        ${'RhodeCode'}
+                    </a>
+                </td></tr>
+                <tr>
+                    <td style="padding:15px;" valign="top">
+                        % for commit in data['push']['commits']:
+                        <a href="${commit['url']}">${commit['short_id']}</a> by ${commit['author']} at ${commit['date']} <br/>
+                        ${commit['message_html']} <br/>
+                        <br/>
+                        % endfor
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+<!-- End of wrapper table -->
+<p><a style="margin-top:15px;margin-left:1%;font-family:sans-serif;font-weight:100;font-size:11px;color:#666666;text-decoration:none;" href="${instance_url}">
+    ${'This is a notification from RhodeCode. %(instance_url)s' % {'instance_url': instance_url}}
+</a></p>
+</body>
+</html>
+''')
+
+
+class EmailSettingsSchema(IntegrationSettingsSchemaBase):
+    @colander.instantiate(validator=colander.Length(min=1))
+    class recipients(colander.SequenceSchema):
+        title = lazy_ugettext('Recipients')
+        description = lazy_ugettext('Email addresses to send push events to')
+        widget = deform.widget.SequenceWidget(min_len=1)
+
+        recipient = colander.SchemaNode(
+            colander.String(),
+            title=lazy_ugettext('Email address'),
+            description=lazy_ugettext('Email address'),
+            default='',
+            validator=colander.Email(),
+            widget=deform.widget.TextInputWidget(
+                placeholder='[e-mail]',
+            ),
+        )
+
+
+class EmailIntegrationType(IntegrationTypeBase):
+    key = 'email'
+    display_name = lazy_ugettext('Email')
+    SettingsSchema = EmailSettingsSchema
+
+    def settings_schema(self):
+        schema = EmailSettingsSchema()
+        return schema
+
+    def send_event(self, event):
+        data = event.as_dict()
+        log.debug('got event: %r', event)
+
+        if isinstance(event, events.RepoPushEvent):
+            repo_push_handler(data, self.settings)
+        else:
+            log.debug('ignoring event: %r', event)
+
+
+def repo_push_handler(data, settings):
+    commit_num = len(data['push']['commits'])
+    server_url = data['server_url']
+
+    if commit_num == 0:
+        subject = '[{repo_name}] {author} pushed {commit_num} commit on branches: {branches}'.format(
+            author=data['actor']['username'],
+            repo_name=data['repo']['repo_name'],
+            commit_num=commit_num,
+            branches=', '.join(
+                branch['name'] for branch in data['push']['branches'])
+        )
+    else:
+        subject = '[{repo_name}] {author} pushed {commit_num} commits on branches: {branches}'.format(
+            author=data['actor']['username'],
+            repo_name=data['repo']['repo_name'],
+            commit_num=commit_num,
+            branches=', '.join(
+                branch['name'] for branch in data['push']['branches']))
+
+    email_body_plaintext = repo_push_template_plaintext.render(
+        data=data,
+        subject=subject,
+        instance_url=server_url)
+
+    email_body_html = repo_push_template_html.render(
+        data=data,
+        subject=subject,
+        instance_url=server_url)
+
+    for email_address in settings['recipients']:
+        run_task(
+            tasks.send_email, email_address, subject,
+            email_body_plaintext, email_body_html)

rhodecode/integrations/types/hipchat.py

@@ -0,0 +1,242 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2012-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+from __future__ import unicode_literals
+import deform
+import re
+import logging
+import requests
+import colander
+import textwrap
+from celery.task import task
+from mako.template import Template
+
+from rhodecode import events
+from rhodecode.translation import lazy_ugettext
+from rhodecode.lib import helpers as h
+from rhodecode.lib.celerylib import run_task
+from rhodecode.lib.colander_utils import strip_whitespace
+from rhodecode.integrations.types.base import IntegrationTypeBase
+from rhodecode.integrations.schema import IntegrationSettingsSchemaBase
+
+log = logging.getLogger(__name__)
+
+
+class HipchatSettingsSchema(IntegrationSettingsSchemaBase):
+    color_choices = [
+        ('yellow', lazy_ugettext('Yellow')),
+        ('red', lazy_ugettext('Red')),
+        ('green', lazy_ugettext('Green')),
+        ('purple', lazy_ugettext('Purple')),
+        ('gray', lazy_ugettext('Gray')),
+    ]
+
+    server_url = colander.SchemaNode(
+        colander.String(),
+        title=lazy_ugettext('Hipchat server URL'),
+        description=lazy_ugettext('Hipchat integration url.'),
+        default='',
+        preparer=strip_whitespace,
+        validator=colander.url,
+        widget=deform.widget.TextInputWidget(
+            placeholder='https://?.hipchat.com/v2/room/?/notification?auth_token=?',
+        ),
+    )
+    notify = colander.SchemaNode(
+        colander.Bool(),
+        title=lazy_ugettext('Notify'),
+        description=lazy_ugettext('Make a notification to the users in room.'),
+        missing=False,
+        default=False,
+    )
+    color = colander.SchemaNode(
+        colander.String(),
+        title=lazy_ugettext('Color'),
+        description=lazy_ugettext('Background color of message.'),
+        missing='',
+        validator=colander.OneOf([x[0] for x in color_choices]),
+        widget=deform.widget.Select2Widget(
+            values=color_choices,
+        ),
+    )
+
+
+repo_push_template = Template('''
+<b>${data['actor']['username']}</b> pushed to
+%if data['push']['branches']:
+${len(data['push']['branches']) > 1 and 'branches' or 'branch'}
+${', '.join('<a href="%s">%s</a>' % (branch['url'], branch['name']) for branch in data['push']['branches'])}
+%else:
+unknown branch
+%endif
+in <a href="${data['repo']['url']}">${data['repo']['repo_name']}</a>
+<br>
+<ul>
+%for commit in data['push']['commits']:
+    <li>
+        <a href="${commit['url']}">${commit['short_id']}</a> - ${commit['message_html']}
+    </li>
+%endfor
+</ul>
+''')
+
+
+
+class HipchatIntegrationType(IntegrationTypeBase):
+    key = 'hipchat'
+    display_name = lazy_ugettext('Hipchat')
+    valid_events = [
+        events.PullRequestCloseEvent,
+        events.PullRequestMergeEvent,
+        events.PullRequestUpdateEvent,
+        events.PullRequestCommentEvent,
+        events.PullRequestReviewEvent,
+        events.PullRequestCreateEvent,
+        events.RepoPushEvent,
+        events.RepoCreateEvent,
+    ]
+
+    def send_event(self, event):
+        if event.__class__ not in self.valid_events:
+            log.debug('event not valid: %r' % event)
+            return
+
+        if event.name not in self.settings['events']:
+            log.debug('event ignored: %r' % event)
+            return
+
+        data = event.as_dict()
+
+        text = '<b>%s<b> caused a <b>%s</b> event' % (
+            data['actor']['username'], event.name)
+
+        log.debug('handling hipchat event for %s' % event.name)
+
+        if isinstance(event, events.PullRequestCommentEvent):
+            text = self.format_pull_request_comment_event(event, data)
+        elif isinstance(event, events.PullRequestReviewEvent):
+            text = self.format_pull_request_review_event(event, data)
+        elif isinstance(event, events.PullRequestEvent):
+            text = self.format_pull_request_event(event, data)
+        elif isinstance(event, events.RepoPushEvent):
+            text = self.format_repo_push_event(data)
+        elif isinstance(event, events.RepoCreateEvent):
+            text = self.format_repo_create_event(data)
+        else:
+            log.error('unhandled event type: %r' % event)
+
+        run_task(post_text_to_hipchat, self.settings, text)
+
+    def settings_schema(self):
+        schema = HipchatSettingsSchema()
+        schema.add(colander.SchemaNode(
+            colander.Set(),
+            widget=deform.widget.CheckboxChoiceWidget(
+                values=sorted(
+                    [(e.name, e.display_name) for e in self.valid_events]
+                )
+            ),
+            description="Events activated for this integration",
+            name='events'
+        ))
+
+        return schema
+
+    def format_pull_request_comment_event(self, event, data):
+        comment_text = data['comment']['text']
+        if len(comment_text) > 200:
+            comment_text = '{comment_text}<a href="{comment_url}">...<a/>'.format(
+                comment_text=comment_text[:200],
+                comment_url=data['comment']['url'],
+            )
+
+        comment_status = ''
+        if data['comment']['status']:
+            comment_status = '[{}]: '.format(data['comment']['status'])
+
+        return (textwrap.dedent(
+            '''
+            {user} commented on pull request <a href="{pr_url}">{number}</a> - {pr_title}:
+            >>> {comment_status}{comment_text}
+            ''').format(
+                comment_status=comment_status,
+                user=data['actor']['username'],
+                number=data['pullrequest']['pull_request_id'],
+                pr_url=data['pullrequest']['url'],
+                pr_status=data['pullrequest']['status'],
+                pr_title=data['pullrequest']['title'],
+                comment_text=comment_text
+            )
+        )
+
+    def format_pull_request_review_event(self, event, data):
+        return (textwrap.dedent(
+            '''
+            Status changed to {pr_status} for pull request <a href="{pr_url}">#{number}</a> - {pr_title}
+            ''').format(
+                user=data['actor']['username'],
+                number=data['pullrequest']['pull_request_id'],
+                pr_url=data['pullrequest']['url'],
+                pr_status=data['pullrequest']['status'],
+                pr_title=data['pullrequest']['title'],
+            )
+        )
+
+    def format_pull_request_event(self, event, data):
+        action = {
+            events.PullRequestCloseEvent: 'closed',
+            events.PullRequestMergeEvent: 'merged',
+            events.PullRequestUpdateEvent: 'updated',
+            events.PullRequestCreateEvent: 'created',
+        }.get(event.__class__, str(event.__class__))
+
+        return ('Pull request <a href="{url}">#{number}</a> - {title} '
+                '{action} by {user}').format(
+            user=data['actor']['username'],
+            number=data['pullrequest']['pull_request_id'],
+            url=data['pullrequest']['url'],
+            title=data['pullrequest']['title'],
+            action=action
+        )
+
+    def format_repo_push_event(self, data):
+        result = repo_push_template.render(
+            data=data,
+        )
+        return result
+
+    def format_repo_create_event(self, data):
+        return '<a href="{}">{}</a> ({}) repository created by <b>{}</b>'.format(
+            data['repo']['url'],
+            data['repo']['repo_name'],
+            data['repo']['repo_type'],
+            data['actor']['username'],
+        )
+
+
+@task(ignore_result=True)
+def post_text_to_hipchat(settings, text):
+    log.debug('sending %s to hipchat %s' % (text, settings['server_url']))
+    resp = requests.post(settings['server_url'], json={
+        "message": text,
+        "color": settings.get('color', 'yellow'),
+        "notify": settings.get('notify', False),
+    })
+    resp.raise_for_status()  # raise exception on a failed request

rhodecode/integrations/types/slack.py

@@ -0,0 +1,253 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2012-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+from __future__ import unicode_literals
+import deform
+import re
+import logging
+import requests
+import colander
+import textwrap
+from celery.task import task
+from mako.template import Template
+
+from rhodecode import events
+from rhodecode.translation import lazy_ugettext
+from rhodecode.lib import helpers as h
+from rhodecode.lib.celerylib import run_task
+from rhodecode.lib.colander_utils import strip_whitespace
+from rhodecode.integrations.types.base import IntegrationTypeBase
+from rhodecode.integrations.schema import IntegrationSettingsSchemaBase
+
+log = logging.getLogger(__name__)
+
+
+class SlackSettingsSchema(IntegrationSettingsSchemaBase):
+    service = colander.SchemaNode(
+        colander.String(),
+        title=lazy_ugettext('Slack service URL'),
+        description=h.literal(lazy_ugettext(
+            'This can be setup at the '
+            '<a href="https://my.slack.com/services/new/incoming-webhook/">'
+            'slack app manager</a>')),
+        default='',
+        preparer=strip_whitespace,
+        validator=colander.url,
+        widget=deform.widget.TextInputWidget(
+            placeholder='https://hooks.slack.com/services/...',
+        ),
+    )
+    username = colander.SchemaNode(
+        colander.String(),
+        title=lazy_ugettext('Username'),
+        description=lazy_ugettext('Username to show notifications coming from.'),
+        missing='Rhodecode',
+        preparer=strip_whitespace,
+        widget=deform.widget.TextInputWidget(
+            placeholder='Rhodecode'
+        ),
+    )
+    channel = colander.SchemaNode(
+        colander.String(),
+        title=lazy_ugettext('Channel'),
+        description=lazy_ugettext('Channel to send notifications to.'),
+        missing='',
+        preparer=strip_whitespace,
+        widget=deform.widget.TextInputWidget(
+            placeholder='#general'
+        ),
+    )
+    icon_emoji = colander.SchemaNode(
+        colander.String(),
+        title=lazy_ugettext('Emoji'),
+        description=lazy_ugettext('Emoji to use eg. :studio_microphone:'),
+        missing='',
+        preparer=strip_whitespace,
+        widget=deform.widget.TextInputWidget(
+            placeholder=':studio_microphone:'
+        ),
+    )
+
+
+repo_push_template = Template(r'''
+*${data['actor']['username']}* pushed to \
+%if data['push']['branches']:
+${len(data['push']['branches']) > 1 and 'branches' or 'branch'} \
+${', '.join('<%s|%s>' % (branch['url'], branch['name']) for branch in data['push']['branches'])} \
+%else:
+unknown branch \
+%endif
+in <${data['repo']['url']}|${data['repo']['repo_name']}>
+>>>
+%for commit in data['push']['commits']:
+<${commit['url']}|${commit['short_id']}> - ${commit['message_html']|html_to_slack_links}
+%endfor
+''')
+
+
+class SlackIntegrationType(IntegrationTypeBase):
+    key = 'slack'
+    display_name = lazy_ugettext('Slack')
+    SettingsSchema = SlackSettingsSchema
+    valid_events = [
+        events.PullRequestCloseEvent,
+        events.PullRequestMergeEvent,
+        events.PullRequestUpdateEvent,
+        events.PullRequestCommentEvent,
+        events.PullRequestReviewEvent,
+        events.PullRequestCreateEvent,
+        events.RepoPushEvent,
+        events.RepoCreateEvent,
+    ]
+
+    def send_event(self, event):
+        if event.__class__ not in self.valid_events:
+            log.debug('event not valid: %r' % event)
+            return
+
+        if event.name not in self.settings['events']:
+            log.debug('event ignored: %r' % event)
+            return
+
+        data = event.as_dict()
+
+        text = '*%s* caused a *%s* event' % (
+            data['actor']['username'], event.name)
+
+        log.debug('handling slack event for %s' % event.name)
+
+        if isinstance(event, events.PullRequestCommentEvent):
+            text = self.format_pull_request_comment_event(event, data)
+        elif isinstance(event, events.PullRequestReviewEvent):
+            text = self.format_pull_request_review_event(event, data)
+        elif isinstance(event, events.PullRequestEvent):
+            text = self.format_pull_request_event(event, data)
+        elif isinstance(event, events.RepoPushEvent):
+            text = self.format_repo_push_event(data)
+        elif isinstance(event, events.RepoCreateEvent):
+            text = self.format_repo_create_event(data)
+        else:
+            log.error('unhandled event type: %r' % event)
+
+        run_task(post_text_to_slack, self.settings, text)
+
+    def settings_schema(self):
+        schema = SlackSettingsSchema()
+        schema.add(colander.SchemaNode(
+            colander.Set(),
+            widget=deform.widget.CheckboxChoiceWidget(
+                values=sorted(
+                    [(e.name, e.display_name) for e in self.valid_events]
+                )
+            ),
+            description="Events activated for this integration",
+            name='events'
+        ))
+
+        return schema
+
+    def format_pull_request_comment_event(self, event, data):
+        comment_text = data['comment']['text']
+        if len(comment_text) > 200:
+            comment_text = '<{comment_url}|{comment_text}...>'.format(
+                comment_text=comment_text[:200],
+                comment_url=data['comment']['url'],
+            )
+
+        comment_status = ''
+        if data['comment']['status']:
+            comment_status = '[{}]: '.format(data['comment']['status'])
+
+        return (textwrap.dedent(
+            '''
+            {user} commented on pull request <{pr_url}|#{number}> - {pr_title}:
+            >>> {comment_status}{comment_text}
+            ''').format(
+                comment_status=comment_status,
+                user=data['actor']['username'],
+                number=data['pullrequest']['pull_request_id'],
+                pr_url=data['pullrequest']['url'],
+                pr_status=data['pullrequest']['status'],
+                pr_title=data['pullrequest']['title'],
+                comment_text=comment_text
+            )
+        )
+
+    def format_pull_request_review_event(self, event, data):
+        return (textwrap.dedent(
+            '''
+            Status changed to {pr_status} for pull request <{pr_url}|#{number}> - {pr_title}
+            ''').format(
+                user=data['actor']['username'],
+                number=data['pullrequest']['pull_request_id'],
+                pr_url=data['pullrequest']['url'],
+                pr_status=data['pullrequest']['status'],
+                pr_title=data['pullrequest']['title'],
+            )
+        )
+
+    def format_pull_request_event(self, event, data):
+        action = {
+            events.PullRequestCloseEvent: 'closed',
+            events.PullRequestMergeEvent: 'merged',
+            events.PullRequestUpdateEvent: 'updated',
+            events.PullRequestCreateEvent: 'created',
+        }.get(event.__class__, str(event.__class__))
+
+        return ('Pull request <{url}|#{number}> - {title} '
+                '{action} by {user}').format(
+            user=data['actor']['username'],
+            number=data['pullrequest']['pull_request_id'],
+            url=data['pullrequest']['url'],
+            title=data['pullrequest']['title'],
+            action=action
+        )
+
+    def format_repo_push_event(self, data):
+        result = repo_push_template.render(
+            data=data,
+            html_to_slack_links=html_to_slack_links,
+        )
+        return result
+
+    def format_repo_create_event(self, data):
+        return '<{}|{}> ({}) repository created by *{}*'.format(
+            data['repo']['url'],
+            data['repo']['repo_name'],
+            data['repo']['repo_type'],
+            data['actor']['username'],
+        )
+
+
+def html_to_slack_links(message):
+    return re.compile(r'<a .*?href=["\'](.+?)".*?>(.+?)</a>').sub(
+        r'<\1|\2>', message)
+
+
+@task(ignore_result=True)
+def post_text_to_slack(settings, text):
+    log.debug('sending %s to slack %s' % (text, settings['service']))
+    resp = requests.post(settings['service'], json={
+        "channel": settings.get('channel', ''),
+        "username": settings.get('username', 'Rhodecode'),
+        "text": text,
+        "icon_emoji": settings.get('icon_emoji', ':studio_microphone:')
+    })
+    resp.raise_for_status()  # raise exception on a failed request

rhodecode/integrations/types/webhook.py

@@ -0,0 +1,111 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2012-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+from __future__ import unicode_literals
+
+import deform
+import logging
+import requests
+import colander
+from celery.task import task
+from mako.template import Template
+
+from rhodecode import events
+from rhodecode.translation import lazy_ugettext
+from rhodecode.integrations.types.base import IntegrationTypeBase
+from rhodecode.integrations.schema import IntegrationSettingsSchemaBase
+
+log = logging.getLogger(__name__)
+
+
+class WebhookSettingsSchema(IntegrationSettingsSchemaBase):
+    url = colander.SchemaNode(
+        colander.String(),
+        title=lazy_ugettext('Webhook URL'),
+        description=lazy_ugettext('URL of the webhook to receive POST event.'),
+        default='',
+        validator=colander.url,
+        widget=deform.widget.TextInputWidget(
+            placeholder='https://www.example.com/webhook'
+        ),
+    )
+    secret_token = colander.SchemaNode(
+        colander.String(),
+        title=lazy_ugettext('Secret Token'),
+        description=lazy_ugettext('String used to validate received payloads.'),
+        default='',
+        widget=deform.widget.TextInputWidget(
+            placeholder='secret_token'
+        ),
+    )
+
+
+class WebhookIntegrationType(IntegrationTypeBase):
+    key = 'webhook'
+    display_name = lazy_ugettext('Webhook')
+    valid_events = [
+        events.PullRequestCloseEvent,
+        events.PullRequestMergeEvent,
+        events.PullRequestUpdateEvent,
+        events.PullRequestCommentEvent,
+        events.PullRequestReviewEvent,
+        events.PullRequestCreateEvent,
+        events.RepoPushEvent,
+        events.RepoCreateEvent,
+    ]
+
+    def settings_schema(self):
+        schema = WebhookSettingsSchema()
+        schema.add(colander.SchemaNode(
+            colander.Set(),
+            widget=deform.widget.CheckboxChoiceWidget(
+                values=sorted(
+                    [(e.name, e.display_name) for e in self.valid_events]
+                )
+            ),
+            description="Events activated for this integration",
+            name='events'
+        ))
+        return schema
+
+    def send_event(self, event):
+        log.debug('handling event %s with webhook integration %s',
+            event.name, self)
+
+        if event.__class__ not in self.valid_events:
+            log.debug('event not valid: %r' % event)
+            return
+
+        if event.name not in self.settings['events']:
+            log.debug('event ignored: %r' % event)
+            return
+
+        data = event.as_dict()
+        post_to_webhook(data, self.settings)
+
+
+@task(ignore_result=True)
+def post_to_webhook(data, settings):
+    log.debug('sending event:%s to webhook %s', data['name'], settings['url'])
+    resp = requests.post(settings['url'], json={
+        'token': settings['secret_token'],
+        'event': data
+    })
+    resp.raise_for_status()  # raise exception on a failed request

rhodecode/integrations/views.py

@@ -0,0 +1,272 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2012-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import colander
+import logging
+import pylons
+import deform
+
+from pyramid.httpexceptions import HTTPFound, HTTPForbidden
+from pyramid.renderers import render
+from pyramid.response import Response
+
+from rhodecode.lib import auth
+from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
+from rhodecode.model.db import Repository, Session, Integration
+from rhodecode.model.scm import ScmModel
+from rhodecode.model.integration import IntegrationModel
+from rhodecode.admin.navigation import navigation_list
+from rhodecode.translation import _
+from rhodecode.integrations import integration_type_registry
+
+log = logging.getLogger(__name__)
+
+
+class IntegrationSettingsViewBase(object):
+    """ Base Integration settings view used by both repo / global settings """
+
+    def __init__(self, context, request):
+        self.context = context
+        self.request = request
+        self._load_general_context()
+
+        if not self.perm_check(request.user):
+            raise HTTPForbidden()
+
+    def _load_general_context(self):
+        """
+        This avoids boilerplate for repo/global+list/edit+views/templates
+        by doing all possible contexts at the same time however it should
+        be split up into separate functions once more "contexts" exist
+        """
+
+        self.IntegrationType = None
+        self.repo = None
+        self.integration = None
+        self.integrations = {}
+
+        request = self.request
+
+        if 'repo_name' in request.matchdict:  # we're in a repo context
+            repo_name = request.matchdict['repo_name']
+            self.repo = Repository.get_by_repo_name(repo_name)
+
+        if 'integration' in request.matchdict:  # we're in integration context
+            integration_type = request.matchdict['integration']
+            self.IntegrationType = integration_type_registry[integration_type]
+
+        if 'integration_id' in request.matchdict:  # single integration context
+            integration_id = request.matchdict['integration_id']
+            self.integration = Integration.get(integration_id)
+        else:                                      # list integrations context
+            for integration in IntegrationModel().get_integrations(self.repo):
+                self.integrations.setdefault(integration.integration_type, []
+                    ).append(integration)
+
+        self.settings = self.integration and self.integration.settings or {}
+
+    def _template_c_context(self):
+        # TODO: dan: this is a stopgap in order to inherit from current pylons
+        # based admin/repo settings templates - this should be removed entirely
+        # after port to pyramid
+
+        c = pylons.tmpl_context
+        c.active = 'integrations'
+        c.rhodecode_user = self.request.user
+        c.repo = self.repo
+        c.repo_name = self.repo and self.repo.repo_name or None
+        if self.repo:
+            c.repo_info = self.repo
+            c.rhodecode_db_repo = self.repo
+            c.repository_pull_requests = ScmModel().get_pull_requests(self.repo)
+        else:
+            c.navlist = navigation_list(self.request)
+
+        return c
+
+    def _form_schema(self):
+        if self.integration:
+            settings = self.integration.settings
+        else:
+            settings = {}
+        return self.IntegrationType(settings=settings).settings_schema()
+
+    def settings_get(self, defaults=None, errors=None, form=None):
+        """
+        View that displays the plugin settings as a form.
+        """
+        defaults = defaults or {}
+        errors = errors or {}
+
+        if self.integration:
+            defaults = self.integration.settings or {}
+            defaults['name'] = self.integration.name
+            defaults['enabled'] = self.integration.enabled
+        else:
+            if self.repo:
+                scope = self.repo.repo_name
+            else:
+                scope = _('Global')
+
+            defaults['name'] = '{} {} integration'.format(scope,
+                self.IntegrationType.display_name)
+            defaults['enabled'] = True
+
+        schema = self._form_schema().bind(request=self.request)
+
+        if self.integration:
+            buttons = ('submit', 'delete')
+        else:
+            buttons = ('submit',)
+
+        form = form or deform.Form(schema, appstruct=defaults, buttons=buttons)
+
+        for node in schema:
+            setting = self.settings.get(node.name)
+            if setting is not None:
+                defaults.setdefault(node.name, setting)
+            else:
+                if node.default:
+                    defaults.setdefault(node.name, node.default)
+
+        template_context = {
+            'form': form,
+            'defaults': defaults,
+            'errors': errors,
+            'schema': schema,
+            'current_IntegrationType': self.IntegrationType,
+            'integration': self.integration,
+            'settings': self.settings,
+            'resource': self.context,
+            'c': self._template_c_context(),
+        }
+
+        return template_context
+
+    @auth.CSRFRequired()
+    def settings_post(self):
+        """
+        View that validates and stores the plugin settings.
+        """
+        if self.request.params.get('delete'):
+            Session().delete(self.integration)
+            Session().commit()
+            self.request.session.flash(
+                _('Integration {integration_name} deleted successfully.').format(
+                    integration_name=self.integration.name),
+                queue='success')
+            if self.repo:
+                redirect_to = self.request.route_url(
+                    'repo_integrations_home', repo_name=self.repo.repo_name)
+            else:
+                redirect_to = self.request.route_url('global_integrations_home')
+            raise HTTPFound(redirect_to)
+
+        schema = self._form_schema().bind(request=self.request)
+
+        form = deform.Form(schema, buttons=('submit', 'delete'))
+
+        params = {}
+        for node in schema.children:
+            if type(node.typ) in (colander.Set, colander.List):
+                val = self.request.params.getall(node.name)
+            else:
+                val = self.request.params.get(node.name)
+            if val:
+                params[node.name] = val
+
+        controls = self.request.POST.items()
+        try:
+            valid_data = form.validate(controls)
+        except deform.ValidationFailure as e:
+            self.request.session.flash(
+                _('Errors exist when saving integration settings. '
+                  'Please check the form inputs.'),
+                queue='error')
+            return self.settings_get(errors={}, defaults=params, form=e)
+
+        if not self.integration:
+            self.integration = Integration()
+            self.integration.integration_type = self.IntegrationType.key
+            if self.repo:
+                self.integration.repo = self.repo
+            Session().add(self.integration)
+
+        self.integration.enabled = valid_data.pop('enabled', False)
+        self.integration.name = valid_data.pop('name')
+        self.integration.settings = valid_data
+
+        Session().commit()
+
+        # Display success message and redirect.
+        self.request.session.flash(
+            _('Integration {integration_name} updated successfully.').format(
+                integration_name=self.IntegrationType.display_name),
+            queue='success')
+
+        if self.repo:
+            redirect_to = self.request.route_url(
+                'repo_integrations_edit', repo_name=self.repo.repo_name,
+                integration=self.integration.integration_type,
+                integration_id=self.integration.integration_id)
+        else:
+            redirect_to = self.request.route_url(
+                'global_integrations_edit',
+                integration=self.integration.integration_type,
+                integration_id=self.integration.integration_id)
+
+        return HTTPFound(redirect_to)
+
+    def index(self):
+        current_integrations = self.integrations
+        if self.IntegrationType:
+            current_integrations = {
+                self.IntegrationType.key: self.integrations.get(
+                    self.IntegrationType.key, [])
+            }
+
+        template_context = {
+            'current_IntegrationType': self.IntegrationType,
+            'current_integrations': current_integrations,
+            'available_integrations': integration_type_registry,
+            'c': self._template_c_context()
+        }
+
+        if self.repo:
+            html = render('rhodecode:templates/admin/integrations/list.html',
+                          template_context,
+                          request=self.request)
+        else:
+            html = render('rhodecode:templates/admin/integrations/list.html',
+                          template_context,
+                          request=self.request)
+
+        return Response(html)
+
+
+class GlobalIntegrationsView(IntegrationSettingsViewBase):
+    def perm_check(self, user):
+        return auth.HasPermissionAll('hg.admin').check_permissions(user=user)
+
+
+class RepoIntegrationsView(IntegrationSettingsViewBase):
+    def perm_check(self, user):
+        return auth.HasRepoPermissionAll('repository.admin'
+            )(repo_name=self.repo.repo_name, user=user)

rhodecode/lib/channelstream.py

@@ -0,0 +1,219 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+import os
+
+import itsdangerous
+import requests
+
+from dogpile.core import ReadWriteMutex
+
+import rhodecode.lib.helpers as h
+
+from rhodecode.lib.auth import HasRepoPermissionAny
+from rhodecode.lib.ext_json import json
+from rhodecode.model.db import User
+
+log = logging.getLogger(__name__)
+
+LOCK = ReadWriteMutex()
+
+STATE_PUBLIC_KEYS = ['id', 'username', 'first_name', 'last_name',
+                     'icon_link', 'display_name', 'display_link']
+
+
+class ChannelstreamException(Exception):
+    pass
+
+
+class ChannelstreamConnectionException(Exception):
+    pass
+
+
+class ChannelstreamPermissionException(Exception):
+    pass
+
+
+def channelstream_request(config, payload, endpoint, raise_exc=True):
+    signer = itsdangerous.TimestampSigner(config['secret'])
+    sig_for_server = signer.sign(endpoint)
+    secret_headers = {'x-channelstream-secret': sig_for_server,
+                      'x-channelstream-endpoint': endpoint,
+                      'Content-Type': 'application/json'}
+    req_url = 'http://{}{}'.format(config['server'], endpoint)
+    response = None
+    try:
+        response = requests.post(req_url, data=json.dumps(payload),
+                                 headers=secret_headers).json()
+    except requests.ConnectionError:
+        log.exception('ConnectionError happened')
+        if raise_exc:
+            raise ChannelstreamConnectionException()
+    except Exception:
+        log.exception('Exception related to channelstream happened')
+        if raise_exc:
+            raise ChannelstreamConnectionException()
+    return response
+
+
+def get_user_data(user_id):
+    user = User.get(user_id)
+    return {
+        'id': user.user_id,
+        'username': user.username,
+        'first_name': user.name,
+        'last_name': user.lastname,
+        'icon_link': h.gravatar_url(user.email, 14),
+        'display_name': h.person(user, 'username_or_name_or_email'),
+        'display_link': h.link_to_user(user),
+    }
+
+
+def broadcast_validator(channel_name):
+    """ checks if user can access the broadcast channel """
+    if channel_name == 'broadcast':
+        return True
+
+
+def repo_validator(channel_name):
+    """ checks if user can access the broadcast channel """
+    channel_prefix = '/repo$'
+    if channel_name.startswith(channel_prefix):
+        elements = channel_name[len(channel_prefix):].split('$')
+        repo_name = elements[0]
+        can_access = HasRepoPermissionAny(
+            'repository.read',
+            'repository.write',
+            'repository.admin')(repo_name)
+        log.debug('permission check for {} channel '
+                  'resulted in {}'.format(repo_name, can_access))
+        if can_access:
+            return True
+    return False
+
+
+def check_channel_permissions(channels, plugin_validators, should_raise=True):
+    valid_channels = []
+
+    validators = [broadcast_validator, repo_validator]
+    if plugin_validators:
+        validators.extend(plugin_validators)
+    for channel_name in channels:
+        is_valid = False
+        for validator in validators:
+            if validator(channel_name):
+                is_valid = True
+                break
+        if is_valid:
+            valid_channels.append(channel_name)
+        else:
+            if should_raise:
+                raise ChannelstreamPermissionException()
+    return valid_channels
+
+
+def get_channels_info(self, channels):
+    payload = {'channels': channels}
+    # gather persistence info
+    return channelstream_request(self._config(), payload, '/info')
+
+
+def parse_channels_info(info_result, include_channel_info=None):
+    """
+    Returns data that contains only secure information that can be
+    presented to clients
+    """
+    include_channel_info = include_channel_info or []
+
+    user_state_dict = {}
+    for userinfo in info_result['users']:
+        user_state_dict[userinfo['user']] = {
+            k: v for k, v in userinfo['state'].items()
+            if k in STATE_PUBLIC_KEYS
+            }
+
+    channels_info = {}
+
+    for c_name, c_info in info_result['channels'].items():
+        if c_name not in include_channel_info:
+            continue
+        connected_list = []
+        for userinfo in c_info['users']:
+            connected_list.append({
+                'user': userinfo['user'],
+                'state': user_state_dict[userinfo['user']]
+            })
+        channels_info[c_name] = {'users': connected_list,
+                                 'history': c_info['history']}
+
+    return channels_info
+
+
+def log_filepath(history_location, channel_name):
+    filename = '{}.log'.format(channel_name.encode('hex'))
+    filepath = os.path.join(history_location, filename)
+    return filepath
+
+
+def read_history(history_location, channel_name):
+    filepath = log_filepath(history_location, channel_name)
+    if not os.path.exists(filepath):
+        return []
+    history_lines_limit = -100
+    history = []
+    with open(filepath, 'rb') as f:
+        for line in f.readlines()[history_lines_limit:]:
+            try:
+                history.append(json.loads(line))
+            except Exception:
+                log.exception('Failed to load history')
+    return history
+
+
+def update_history_from_logs(config, channels, payload):
+    history_location = config.get('history.location')
+    for channel in channels:
+        history = read_history(history_location, channel)
+        payload['channels_info'][channel]['history'] = history
+
+
+def write_history(config, message):
+    """ writes a messge to a base64encoded filename """
+    history_location = config.get('history.location')
+    if not os.path.exists(history_location):
+        return
+    try:
+        LOCK.acquire_write_lock()
+        filepath = log_filepath(history_location, message['channel'])
+        with open(filepath, 'ab') as f:
+            json.dump(message, f)
+            f.write('\n')
+    finally:
+        LOCK.release_write_lock()
+
+
+def get_connection_validators(registry):
+    validators = []
+    for k, config in registry.rhodecode_plugins.iteritems():
+        validator = config.get('channelstream', {}).get('connect_validator')
+        if validator:
+            validators.append(validator)
+    return validators

rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py

@@ -0,0 +1,3516 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+"""
+Database Models for RhodeCode Enterprise
+"""
+
+import os
+import sys
+import time
+import hashlib
+import logging
+import datetime
+import warnings
+import ipaddress
+import functools
+import traceback
+import collections
+
+
+from sqlalchemy import *
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.ext.declarative import declared_attr
+from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy.orm import (
+    relationship, joinedload, class_mapper, validates, aliased)
+from sqlalchemy.sql.expression import true
+from beaker.cache import cache_region, region_invalidate
+from webob.exc import HTTPNotFound
+from zope.cachedescriptors.property import Lazy as LazyProperty
+
+from pylons import url
+from pylons.i18n.translation import lazy_ugettext as _
+
+from rhodecode.lib.vcs import get_backend
+from rhodecode.lib.vcs.utils.helpers import get_scm
+from rhodecode.lib.vcs.exceptions import VCSError
+from rhodecode.lib.vcs.backends.base import (
+    EmptyCommit, Reference, MergeFailureReason)
+from rhodecode.lib.utils2 import (
+    str2bool, safe_str, get_commit_safe, safe_unicode, remove_prefix, md5_safe,
+    time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict)
+from rhodecode.lib.ext_json import json
+from rhodecode.lib.caching_query import FromCache
+from rhodecode.lib.encrypt import AESCipher
+
+from rhodecode.model.meta import Base, Session
+
+URL_SEP = '/'
+log = logging.getLogger(__name__)
+
+# =============================================================================
+# BASE CLASSES
+# =============================================================================
+
+# this is propagated from .ini file rhodecode.encrypted_values.secret or
+# beaker.session.secret if first is not set.
+# and initialized at environment.py
+ENCRYPTION_KEY = None
+
+# used to sort permissions by types, '#' used here is not allowed to be in
+# usernames, and it's very early in sorted string.printable table.
+PERMISSION_TYPE_SORT = {
+    'admin': '####',
+    'write': '###',
+    'read':  '##',
+    'none':  '#',
+}
+
+
+def display_sort(obj):
+    """
+    Sort function used to sort permissions in .permissions() function of
+    Repository, RepoGroup, UserGroup. Also it put the default user in front
+    of all other resources
+    """
+
+    if obj.username == User.DEFAULT_USER:
+        return '#####'
+    prefix = PERMISSION_TYPE_SORT.get(obj.permission.split('.')[-1], '')
+    return prefix + obj.username
+
+
+def _hash_key(k):
+    return md5_safe(k)
+
+
+class EncryptedTextValue(TypeDecorator):
+    """
+    Special column for encrypted long text data, use like::
+
+        value = Column("encrypted_value", EncryptedValue(), nullable=False)
+
+    This column is intelligent so if value is in unencrypted form it return
+    unencrypted form, but on save it always encrypts
+    """
+    impl = Text
+
+    def process_bind_param(self, value, dialect):
+        if not value:
+            return value
+        if value.startswith('enc$aes$') or value.startswith('enc$aes_hmac$'):
+            # protect against double encrypting if someone manually starts
+            # doing
+            raise ValueError('value needs to be in unencrypted format, ie. '
+                             'not starting with enc$aes')
+        return 'enc$aes_hmac$%s' % AESCipher(
+            ENCRYPTION_KEY, hmac=True).encrypt(value)
+
+    def process_result_value(self, value, dialect):
+        import rhodecode
+
+        if not value:
+            return value
+
+        parts = value.split('$', 3)
+        if not len(parts) == 3:
+            # probably not encrypted values
+            return value
+        else:
+            if parts[0] != 'enc':
+                # parts ok but without our header ?
+                return value
+            enc_strict_mode = str2bool(rhodecode.CONFIG.get(
+                'rhodecode.encrypted_values.strict') or True)
+            # at that stage we know it's our encryption
+            if parts[1] == 'aes':
+                decrypted_data = AESCipher(ENCRYPTION_KEY).decrypt(parts[2])
+            elif parts[1] == 'aes_hmac':
+                decrypted_data = AESCipher(
+                    ENCRYPTION_KEY, hmac=True,
+                    strict_verification=enc_strict_mode).decrypt(parts[2])
+            else:
+                raise ValueError(
+                    'Encryption type part is wrong, must be `aes` '
+                    'or `aes_hmac`, got `%s` instead' % (parts[1]))
+            return decrypted_data
+
+
+class BaseModel(object):
+    """
+    Base Model for all classes
+    """
+
+    @classmethod
+    def _get_keys(cls):
+        """return column names for this model """
+        return class_mapper(cls).c.keys()
+
+    def get_dict(self):
+        """
+        return dict with keys and values corresponding
+        to this model data """
+
+        d = {}
+        for k in self._get_keys():
+            d[k] = getattr(self, k)
+
+        # also use __json__() if present to get additional fields
+        _json_attr = getattr(self, '__json__', None)
+        if _json_attr:
+            # update with attributes from __json__
+            if callable(_json_attr):
+                _json_attr = _json_attr()
+            for k, val in _json_attr.iteritems():
+                d[k] = val
+        return d
+
+    def get_appstruct(self):
+        """return list with keys and values tuples corresponding
+        to this model data """
+
+        l = []
+        for k in self._get_keys():
+            l.append((k, getattr(self, k),))
+        return l
+
+    def populate_obj(self, populate_dict):
+        """populate model with data from given populate_dict"""
+
+        for k in self._get_keys():
+            if k in populate_dict:
+                setattr(self, k, populate_dict[k])
+
+    @classmethod
+    def query(cls):
+        return Session().query(cls)
+
+    @classmethod
+    def get(cls, id_):
+        if id_:
+            return cls.query().get(id_)
+
+    @classmethod
+    def get_or_404(cls, id_):
+        try:
+            id_ = int(id_)
+        except (TypeError, ValueError):
+            raise HTTPNotFound
+
+        res = cls.query().get(id_)
+        if not res:
+            raise HTTPNotFound
+        return res
+
+    @classmethod
+    def getAll(cls):
+        # deprecated and left for backward compatibility
+        return cls.get_all()
+
+    @classmethod
+    def get_all(cls):
+        return cls.query().all()
+
+    @classmethod
+    def delete(cls, id_):
+        obj = cls.query().get(id_)
+        Session().delete(obj)
+
+    @classmethod
+    def identity_cache(cls, session, attr_name, value):
+        exist_in_session = []
+        for (item_cls, pkey), instance in session.identity_map.items():
+            if cls == item_cls and getattr(instance, attr_name) == value:
+                exist_in_session.append(instance)
+        if exist_in_session:
+            if len(exist_in_session) == 1:
+                return exist_in_session[0]
+            log.exception(
+                'multiple objects with attr %s and '
+                'value %s found with same name: %r',
+                attr_name, value, exist_in_session)
+
+    def __repr__(self):
+        if hasattr(self, '__unicode__'):
+            # python repr needs to return str
+            try:
+                return safe_str(self.__unicode__())
+            except UnicodeDecodeError:
+                pass
+        return '<DB:%s>' % (self.__class__.__name__)
+
+
+class RhodeCodeSetting(Base, BaseModel):
+    __tablename__ = 'rhodecode_settings'
+    __table_args__ = (
+        UniqueConstraint('app_settings_name'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    SETTINGS_TYPES = {
+        'str': safe_str,
+        'int': safe_int,
+        'unicode': safe_unicode,
+        'bool': str2bool,
+        'list': functools.partial(aslist, sep=',')
+    }
+    DEFAULT_UPDATE_URL = 'https://rhodecode.com/api/v1/info/versions'
+    GLOBAL_CONF_KEY = 'app_settings'
+
+    app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    app_settings_name = Column("app_settings_name", String(255), nullable=True, unique=None, default=None)
+    _app_settings_value = Column("app_settings_value", String(4096), nullable=True, unique=None, default=None)
+    _app_settings_type = Column("app_settings_type", String(255), nullable=True, unique=None, default=None)
+
+    def __init__(self, key='', val='', type='unicode'):
+        self.app_settings_name = key
+        self.app_settings_type = type
+        self.app_settings_value = val
+
+    @validates('_app_settings_value')
+    def validate_settings_value(self, key, val):
+        assert type(val) == unicode
+        return val
+
+    @hybrid_property
+    def app_settings_value(self):
+        v = self._app_settings_value
+        _type = self.app_settings_type
+        if _type:
+            _type = self.app_settings_type.split('.')[0]
+            # decode the encrypted value
+            if 'encrypted' in self.app_settings_type:
+                cipher = EncryptedTextValue()
+                v = safe_unicode(cipher.process_result_value(v, None))
+
+        converter = self.SETTINGS_TYPES.get(_type) or \
+            self.SETTINGS_TYPES['unicode']
+        return converter(v)
+
+    @app_settings_value.setter
+    def app_settings_value(self, val):
+        """
+        Setter that will always make sure we use unicode in app_settings_value
+
+        :param val:
+        """
+        val = safe_unicode(val)
+        # encode the encrypted value
+        if 'encrypted' in self.app_settings_type:
+            cipher = EncryptedTextValue()
+            val = safe_unicode(cipher.process_bind_param(val, None))
+        self._app_settings_value = val
+
+    @hybrid_property
+    def app_settings_type(self):
+        return self._app_settings_type
+
+    @app_settings_type.setter
+    def app_settings_type(self, val):
+        if val.split('.')[0] not in self.SETTINGS_TYPES:
+            raise Exception('type must be one of %s got %s'
+                            % (self.SETTINGS_TYPES.keys(), val))
+        self._app_settings_type = val
+
+    def __unicode__(self):
+        return u"<%s('%s:%s[%s]')>" % (
+            self.__class__.__name__,
+            self.app_settings_name, self.app_settings_value,
+            self.app_settings_type
+        )
+
+
+class RhodeCodeUi(Base, BaseModel):
+    __tablename__ = 'rhodecode_ui'
+    __table_args__ = (
+        UniqueConstraint('ui_key'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    HOOK_REPO_SIZE = 'changegroup.repo_size'
+    # HG
+    HOOK_PRE_PULL = 'preoutgoing.pre_pull'
+    HOOK_PULL = 'outgoing.pull_logger'
+    HOOK_PRE_PUSH = 'prechangegroup.pre_push'
+    HOOK_PUSH = 'changegroup.push_logger'
+
+    # TODO: johbo: Unify way how hooks are configured for git and hg,
+    # git part is currently hardcoded.
+
+    # SVN PATTERNS
+    SVN_BRANCH_ID = 'vcs_svn_branch'
+    SVN_TAG_ID = 'vcs_svn_tag'
+
+    ui_id = Column(
+        "ui_id", Integer(), nullable=False, unique=True, default=None,
+        primary_key=True)
+    ui_section = Column(
+        "ui_section", String(255), nullable=True, unique=None, default=None)
+    ui_key = Column(
+        "ui_key", String(255), nullable=True, unique=None, default=None)
+    ui_value = Column(
+        "ui_value", String(255), nullable=True, unique=None, default=None)
+    ui_active = Column(
+        "ui_active", Boolean(), nullable=True, unique=None, default=True)
+
+    def __repr__(self):
+        return '<%s[%s]%s=>%s]>' % (self.__class__.__name__, self.ui_section,
+                                    self.ui_key, self.ui_value)
+
+
+class RepoRhodeCodeSetting(Base, BaseModel):
+    __tablename__ = 'repo_rhodecode_settings'
+    __table_args__ = (
+        UniqueConstraint(
+            'app_settings_name', 'repository_id',
+            name='uq_repo_rhodecode_setting_name_repo_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    repository_id = Column(
+        "repository_id", Integer(), ForeignKey('repositories.repo_id'),
+        nullable=False)
+    app_settings_id = Column(
+        "app_settings_id", Integer(), nullable=False, unique=True,
+        default=None, primary_key=True)
+    app_settings_name = Column(
+        "app_settings_name", String(255), nullable=True, unique=None,
+        default=None)
+    _app_settings_value = Column(
+        "app_settings_value", String(4096), nullable=True, unique=None,
+        default=None)
+    _app_settings_type = Column(
+        "app_settings_type", String(255), nullable=True, unique=None,
+        default=None)
+
+    repository = relationship('Repository')
+
+    def __init__(self, repository_id, key='', val='', type='unicode'):
+        self.repository_id = repository_id
+        self.app_settings_name = key
+        self.app_settings_type = type
+        self.app_settings_value = val
+
+    @validates('_app_settings_value')
+    def validate_settings_value(self, key, val):
+        assert type(val) == unicode
+        return val
+
+    @hybrid_property
+    def app_settings_value(self):
+        v = self._app_settings_value
+        type_ = self.app_settings_type
+        SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
+        converter = SETTINGS_TYPES.get(type_) or SETTINGS_TYPES['unicode']
+        return converter(v)
+
+    @app_settings_value.setter
+    def app_settings_value(self, val):
+        """
+        Setter that will always make sure we use unicode in app_settings_value
+
+        :param val:
+        """
+        self._app_settings_value = safe_unicode(val)
+
+    @hybrid_property
+    def app_settings_type(self):
+        return self._app_settings_type
+
+    @app_settings_type.setter
+    def app_settings_type(self, val):
+        SETTINGS_TYPES = RhodeCodeSetting.SETTINGS_TYPES
+        if val not in SETTINGS_TYPES:
+            raise Exception('type must be one of %s got %s'
+                            % (SETTINGS_TYPES.keys(), val))
+        self._app_settings_type = val
+
+    def __unicode__(self):
+        return u"<%s('%s:%s:%s[%s]')>" % (
+            self.__class__.__name__, self.repository.repo_name,
+            self.app_settings_name, self.app_settings_value,
+            self.app_settings_type
+        )
+
+
+class RepoRhodeCodeUi(Base, BaseModel):
+    __tablename__ = 'repo_rhodecode_ui'
+    __table_args__ = (
+        UniqueConstraint(
+            'repository_id', 'ui_section', 'ui_key',
+            name='uq_repo_rhodecode_ui_repository_id_section_key'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    repository_id = Column(
+        "repository_id", Integer(), ForeignKey('repositories.repo_id'),
+        nullable=False)
+    ui_id = Column(
+        "ui_id", Integer(), nullable=False, unique=True, default=None,
+        primary_key=True)
+    ui_section = Column(
+        "ui_section", String(255), nullable=True, unique=None, default=None)
+    ui_key = Column(
+        "ui_key", String(255), nullable=True, unique=None, default=None)
+    ui_value = Column(
+        "ui_value", String(255), nullable=True, unique=None, default=None)
+    ui_active = Column(
+        "ui_active", Boolean(), nullable=True, unique=None, default=True)
+
+    repository = relationship('Repository')
+
+    def __repr__(self):
+        return '<%s[%s:%s]%s=>%s]>' % (
+            self.__class__.__name__, self.repository.repo_name,
+            self.ui_section, self.ui_key, self.ui_value)
+
+
+class User(Base, BaseModel):
+    __tablename__ = 'users'
+    __table_args__ = (
+        UniqueConstraint('username'), UniqueConstraint('email'),
+        Index('u_username_idx', 'username'),
+        Index('u_email_idx', 'email'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    DEFAULT_USER = 'default'
+    DEFAULT_USER_EMAIL = '[e-mail]'
+    DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}'
+
+    user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    username = Column("username", String(255), nullable=True, unique=None, default=None)
+    password = Column("password", String(255), nullable=True, unique=None, default=None)
+    active = Column("active", Boolean(), nullable=True, unique=None, default=True)
+    admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)
+    name = Column("firstname", String(255), nullable=True, unique=None, default=None)
+    lastname = Column("lastname", String(255), nullable=True, unique=None, default=None)
+    _email = Column("email", String(255), nullable=True, unique=None, default=None)
+    last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)
+    extern_type = Column("extern_type", String(255), nullable=True, unique=None, default=None)
+    extern_name = Column("extern_name", String(255), nullable=True, unique=None, default=None)
+    api_key = Column("api_key", String(255), nullable=True, unique=None, default=None)
+    inherit_default_permissions = Column("inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    _user_data = Column("user_data", LargeBinary(), nullable=True)  # JSON data
+
+    user_log = relationship('UserLog')
+    user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all')
+
+    repositories = relationship('Repository')
+    repository_groups = relationship('RepoGroup')
+    user_groups = relationship('UserGroup')
+
+    user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
+    followings = relationship('UserFollowing', primaryjoin='UserFollowing.user_id==User.user_id', cascade='all')
+
+    repo_to_perm = relationship('UserRepoToPerm', primaryjoin='UserRepoToPerm.user_id==User.user_id', cascade='all')
+    repo_group_to_perm = relationship('UserRepoGroupToPerm', primaryjoin='UserRepoGroupToPerm.user_id==User.user_id', cascade='all')
+    user_group_to_perm = relationship('UserUserGroupToPerm', primaryjoin='UserUserGroupToPerm.user_id==User.user_id', cascade='all')
+
+    group_member = relationship('UserGroupMember', cascade='all')
+
+    notifications = relationship('UserNotification', cascade='all')
+    # notifications assigned to this user
+    user_created_notifications = relationship('Notification', cascade='all')
+    # comments created by this user
+    user_comments = relationship('ChangesetComment', cascade='all')
+    # user profile extra info
+    user_emails = relationship('UserEmailMap', cascade='all')
+    user_ip_map = relationship('UserIpMap', cascade='all')
+    user_auth_tokens = relationship('UserApiKeys', cascade='all')
+    # gists
+    user_gists = relationship('Gist', cascade='all')
+    # user pull requests
+    user_pull_requests = relationship('PullRequest', cascade='all')
+    # external identities
+    extenal_identities = relationship(
+        'ExternalIdentity',
+        primaryjoin="User.user_id==ExternalIdentity.local_user_id",
+        cascade='all')
+
+    def __unicode__(self):
+        return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
+                                      self.user_id, self.username)
+
+    @hybrid_property
+    def email(self):
+        return self._email
+
+    @email.setter
+    def email(self, val):
+        self._email = val.lower() if val else None
+
+    @property
+    def firstname(self):
+        # alias for future
+        return self.name
+
+    @property
+    def emails(self):
+        other = UserEmailMap.query().filter(UserEmailMap.user==self).all()
+        return [self.email] + [x.email for x in other]
+
+    @property
+    def auth_tokens(self):
+        return [self.api_key] + [x.api_key for x in self.extra_auth_tokens]
+
+    @property
+    def extra_auth_tokens(self):
+        return UserApiKeys.query().filter(UserApiKeys.user == self).all()
+
+    @property
+    def feed_token(self):
+        feed_tokens = UserApiKeys.query()\
+            .filter(UserApiKeys.user == self)\
+            .filter(UserApiKeys.role == UserApiKeys.ROLE_FEED)\
+            .all()
+        if feed_tokens:
+            return feed_tokens[0].api_key
+        else:
+            # use the main token so we don't end up with nothing...
+            return self.api_key
+
+    @classmethod
+    def extra_valid_auth_tokens(cls, user, role=None):
+        tokens = UserApiKeys.query().filter(UserApiKeys.user == user)\
+                .filter(or_(UserApiKeys.expires == -1,
+                            UserApiKeys.expires >= time.time()))
+        if role:
+            tokens = tokens.filter(or_(UserApiKeys.role == role,
+                                       UserApiKeys.role == UserApiKeys.ROLE_ALL))
+        return tokens.all()
+
+    @property
+    def ip_addresses(self):
+        ret = UserIpMap.query().filter(UserIpMap.user == self).all()
+        return [x.ip_addr for x in ret]
+
+    @property
+    def username_and_name(self):
+        return '%s (%s %s)' % (self.username, self.firstname, self.lastname)
+
+    @property
+    def username_or_name_or_email(self):
+        full_name = self.full_name if self.full_name is not ' ' else None
+        return self.username or full_name or self.email
+
+    @property
+    def full_name(self):
+        return '%s %s' % (self.firstname, self.lastname)
+
+    @property
+    def full_name_or_username(self):
+        return ('%s %s' % (self.firstname, self.lastname)
+                if (self.firstname and self.lastname) else self.username)
+
+    @property
+    def full_contact(self):
+        return '%s %s <%s>' % (self.firstname, self.lastname, self.email)
+
+    @property
+    def short_contact(self):
+        return '%s %s' % (self.firstname, self.lastname)
+
+    @property
+    def is_admin(self):
+        return self.admin
+
+    @property
+    def AuthUser(self):
+        """
+        Returns instance of AuthUser for this user
+        """
+        from rhodecode.lib.auth import AuthUser
+        return AuthUser(user_id=self.user_id, api_key=self.api_key,
+                        username=self.username)
+
+    @hybrid_property
+    def user_data(self):
+        if not self._user_data:
+            return {}
+
+        try:
+            return json.loads(self._user_data)
+        except TypeError:
+            return {}
+
+    @user_data.setter
+    def user_data(self, val):
+        if not isinstance(val, dict):
+            raise Exception('user_data must be dict, got %s' % type(val))
+        try:
+            self._user_data = json.dumps(val)
+        except Exception:
+            log.error(traceback.format_exc())
+
+    @classmethod
+    def get_by_username(cls, username, case_insensitive=False,
+                        cache=False, identity_cache=False):
+        session = Session()
+
+        if case_insensitive:
+            q = cls.query().filter(
+                func.lower(cls.username) == func.lower(username))
+        else:
+            q = cls.query().filter(cls.username == username)
+
+        if cache:
+            if identity_cache:
+                val = cls.identity_cache(session, 'username', username)
+                if val:
+                    return val
+            else:
+                q = q.options(
+                    FromCache("sql_cache_short",
+                              "get_user_by_name_%s" % _hash_key(username)))
+
+        return q.scalar()
+
+    @classmethod
+    def get_by_auth_token(cls, auth_token, cache=False, fallback=True):
+        q = cls.query().filter(cls.api_key == auth_token)
+
+        if cache:
+            q = q.options(FromCache("sql_cache_short",
+                                    "get_auth_token_%s" % auth_token))
+        res = q.scalar()
+
+        if fallback and not res:
+            #fallback to additional keys
+            _res = UserApiKeys.query()\
+                .filter(UserApiKeys.api_key == auth_token)\
+                .filter(or_(UserApiKeys.expires == -1,
+                            UserApiKeys.expires >= time.time()))\
+                .first()
+            if _res:
+                res = _res.user
+        return res
+
+    @classmethod
+    def get_by_email(cls, email, case_insensitive=False, cache=False):
+
+        if case_insensitive:
+            q = cls.query().filter(func.lower(cls.email) == func.lower(email))
+
+        else:
+            q = cls.query().filter(cls.email == email)
+
+        if cache:
+            q = q.options(FromCache("sql_cache_short",
+                                    "get_email_key_%s" % email))
+
+        ret = q.scalar()
+        if ret is None:
+            q = UserEmailMap.query()
+            # try fetching in alternate email map
+            if case_insensitive:
+                q = q.filter(func.lower(UserEmailMap.email) == func.lower(email))
+            else:
+                q = q.filter(UserEmailMap.email == email)
+            q = q.options(joinedload(UserEmailMap.user))
+            if cache:
+                q = q.options(FromCache("sql_cache_short",
+                                        "get_email_map_key_%s" % email))
+            ret = getattr(q.scalar(), 'user', None)
+
+        return ret
+
+    @classmethod
+    def get_from_cs_author(cls, author):
+        """
+        Tries to get User objects out of commit author string
+
+        :param author:
+        """
+        from rhodecode.lib.helpers import email, author_name
+        # Valid email in the attribute passed, see if they're in the system
+        _email = email(author)
+        if _email:
+            user = cls.get_by_email(_email, case_insensitive=True)
+            if user:
+                return user
+        # Maybe we can match by username?
+        _author = author_name(author)
+        user = cls.get_by_username(_author, case_insensitive=True)
+        if user:
+            return user
+
+    def update_userdata(self, **kwargs):
+        usr = self
+        old = usr.user_data
+        old.update(**kwargs)
+        usr.user_data = old
+        Session().add(usr)
+        log.debug('updated userdata with ', kwargs)
+
+    def update_lastlogin(self):
+        """Update user lastlogin"""
+        self.last_login = datetime.datetime.now()
+        Session().add(self)
+        log.debug('updated user %s lastlogin', self.username)
+
+    def update_lastactivity(self):
+        """Update user lastactivity"""
+        usr = self
+        old = usr.user_data
+        old.update({'last_activity': time.time()})
+        usr.user_data = old
+        Session().add(usr)
+        log.debug('updated user %s lastactivity', usr.username)
+
+    def update_password(self, new_password, change_api_key=False):
+        from rhodecode.lib.auth import get_crypt_password,generate_auth_token
+
+        self.password = get_crypt_password(new_password)
+        if change_api_key:
+            self.api_key = generate_auth_token(self.username)
+        Session().add(self)
+
+    @classmethod
+    def get_first_super_admin(cls):
+        user = User.query().filter(User.admin == true()).first()
+        if user is None:
+            raise Exception('FATAL: Missing administrative account!')
+        return user
+
+    @classmethod
+    def get_all_super_admins(cls):
+        """
+        Returns all admin accounts sorted by username
+        """
+        return User.query().filter(User.admin == true())\
+            .order_by(User.username.asc()).all()
+
+    @classmethod
+    def get_default_user(cls, cache=False):
+        user = User.get_by_username(User.DEFAULT_USER, cache=cache)
+        if user is None:
+            raise Exception('FATAL: Missing default account!')
+        return user
+
+    def _get_default_perms(self, user, suffix=''):
+        from rhodecode.model.permission import PermissionModel
+        return PermissionModel().get_default_perms(user.user_perms, suffix)
+
+    def get_default_perms(self, suffix=''):
+        return self._get_default_perms(self, suffix)
+
+    def get_api_data(self, include_secrets=False, details='full'):
+        """
+        Common function for generating user related data for API
+
+        :param include_secrets: By default secrets in the API data will be replaced
+           by a placeholder value to prevent exposing this data by accident. In case
+           this data shall be exposed, set this flag to ``True``.
+
+        :param details: details can be 'basic|full' basic gives only a subset of
+           the available user information that includes user_id, name and emails.
+        """
+        user = self
+        user_data = self.user_data
+        data = {
+            'user_id': user.user_id,
+            'username': user.username,
+            'firstname': user.name,
+            'lastname': user.lastname,
+            'email': user.email,
+            'emails': user.emails,
+        }
+        if details == 'basic':
+            return data
+
+        api_key_length = 40
+        api_key_replacement = '*' * api_key_length
+
+        extras = {
+            'api_key': api_key_replacement,
+            'api_keys': [api_key_replacement],
+            'active': user.active,
+            'admin': user.admin,
+            'extern_type': user.extern_type,
+            'extern_name': user.extern_name,
+            'last_login': user.last_login,
+            'ip_addresses': user.ip_addresses,
+            'language': user_data.get('language')
+        }
+        data.update(extras)
+
+        if include_secrets:
+            data['api_key'] = user.api_key
+            data['api_keys'] = user.auth_tokens
+        return data
+
+    def __json__(self):
+        data = {
+            'full_name': self.full_name,
+            'full_name_or_username': self.full_name_or_username,
+            'short_contact': self.short_contact,
+            'full_contact': self.full_contact,
+        }
+        data.update(self.get_api_data())
+        return data
+
+
+class UserApiKeys(Base, BaseModel):
+    __tablename__ = 'user_api_keys'
+    __table_args__ = (
+        Index('uak_api_key_idx', 'api_key'),
+        Index('uak_api_key_expires_idx', 'api_key', 'expires'),
+        UniqueConstraint('api_key'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    __mapper_args__ = {}
+
+    # ApiKey role
+    ROLE_ALL = 'token_role_all'
+    ROLE_HTTP = 'token_role_http'
+    ROLE_VCS = 'token_role_vcs'
+    ROLE_API = 'token_role_api'
+    ROLE_FEED = 'token_role_feed'
+    ROLES = [ROLE_ALL, ROLE_HTTP, ROLE_VCS, ROLE_API, ROLE_FEED]
+
+    user_api_key_id = Column("user_api_key_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
+    api_key = Column("api_key", String(255), nullable=False, unique=True)
+    description = Column('description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
+    expires = Column('expires', Float(53), nullable=False)
+    role = Column('role', String(255), nullable=True)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+
+    user = relationship('User', lazy='joined')
+
+    @classmethod
+    def _get_role_name(cls, role):
+        return {
+            cls.ROLE_ALL: _('all'),
+            cls.ROLE_HTTP: _('http/web interface'),
+            cls.ROLE_VCS: _('vcs (git/hg/svn protocol)'),
+            cls.ROLE_API: _('api calls'),
+            cls.ROLE_FEED: _('feed access'),
+        }.get(role, role)
+
+    @property
+    def expired(self):
+        if self.expires == -1:
+            return False
+        return time.time() > self.expires
+
+    @property
+    def role_humanized(self):
+        return self._get_role_name(self.role)
+
+
+class UserEmailMap(Base, BaseModel):
+    __tablename__ = 'user_email_map'
+    __table_args__ = (
+        Index('uem_email_idx', 'email'),
+        UniqueConstraint('email'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    __mapper_args__ = {}
+
+    email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
+    _email = Column("email", String(255), nullable=True, unique=False, default=None)
+    user = relationship('User', lazy='joined')
+
+    @validates('_email')
+    def validate_email(self, key, email):
+        # check if this email is not main one
+        main_email = Session().query(User).filter(User.email == email).scalar()
+        if main_email is not None:
+            raise AttributeError('email %s is present is user table' % email)
+        return email
+
+    @hybrid_property
+    def email(self):
+        return self._email
+
+    @email.setter
+    def email(self, val):
+        self._email = val.lower() if val else None
+
+
+class UserIpMap(Base, BaseModel):
+    __tablename__ = 'user_ip_map'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'ip_addr'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    __mapper_args__ = {}
+
+    ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
+    ip_addr = Column("ip_addr", String(255), nullable=True, unique=False, default=None)
+    active = Column("active", Boolean(), nullable=True, unique=None, default=True)
+    description = Column("description", String(10000), nullable=True, unique=None, default=None)
+    user = relationship('User', lazy='joined')
+
+    @classmethod
+    def _get_ip_range(cls, ip_addr):
+        net = ipaddress.ip_network(ip_addr, strict=False)
+        return [str(net.network_address), str(net.broadcast_address)]
+
+    def __json__(self):
+        return {
+          'ip_addr': self.ip_addr,
+          'ip_range': self._get_ip_range(self.ip_addr),
+        }
+
+    def __unicode__(self):
+        return u"<%s('user_id:%s=>%s')>" % (self.__class__.__name__,
+                                            self.user_id, self.ip_addr)
+
+class UserLog(Base, BaseModel):
+    __tablename__ = 'user_logs'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    user_log_id = Column("user_log_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
+    username = Column("username", String(255), nullable=True, unique=None, default=None)
+    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True)
+    repository_name = Column("repository_name", String(255), nullable=True, unique=None, default=None)
+    user_ip = Column("user_ip", String(255), nullable=True, unique=None, default=None)
+    action = Column("action", Text().with_variant(Text(1200000), 'mysql'), nullable=True, unique=None, default=None)
+    action_date = Column("action_date", DateTime(timezone=False), nullable=True, unique=None, default=None)
+
+    def __unicode__(self):
+        return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
+                                      self.repository_name,
+                                      self.action)
+
+    @property
+    def action_as_day(self):
+        return datetime.date(*self.action_date.timetuple()[:3])
+
+    user = relationship('User')
+    repository = relationship('Repository', cascade='')
+
+
+class UserGroup(Base, BaseModel):
+    __tablename__ = 'users_groups'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    users_group_name = Column("users_group_name", String(255), nullable=False, unique=True, default=None)
+    user_group_description = Column("user_group_description", String(10000), nullable=True, unique=None, default=None)
+    users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None)
+    inherit_default_permissions = Column("users_group_inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    _group_data = Column("group_data", LargeBinary(), nullable=True)  # JSON data
+
+    members = relationship('UserGroupMember', cascade="all, delete, delete-orphan", lazy="joined")
+    users_group_to_perm = relationship('UserGroupToPerm', cascade='all')
+    users_group_repo_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
+    users_group_repo_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
+    user_user_group_to_perm = relationship('UserUserGroupToPerm', cascade='all')
+    user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all')
+
+    user = relationship('User')
+
+    @hybrid_property
+    def group_data(self):
+        if not self._group_data:
+            return {}
+
+        try:
+            return json.loads(self._group_data)
+        except TypeError:
+            return {}
+
+    @group_data.setter
+    def group_data(self, val):
+        try:
+            self._group_data = json.dumps(val)
+        except Exception:
+            log.error(traceback.format_exc())
+
+    def __unicode__(self):
+        return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
+                                      self.users_group_id,
+                                      self.users_group_name)
+
+    @classmethod
+    def get_by_group_name(cls, group_name, cache=False,
+                          case_insensitive=False):
+        if case_insensitive:
+            q = cls.query().filter(func.lower(cls.users_group_name) ==
+                                   func.lower(group_name))
+
+        else:
+            q = cls.query().filter(cls.users_group_name == group_name)
+        if cache:
+            q = q.options(FromCache(
+                            "sql_cache_short",
+                            "get_group_%s" % _hash_key(group_name)))
+        return q.scalar()
+
+    @classmethod
+    def get(cls, user_group_id, cache=False):
+        user_group = cls.query()
+        if cache:
+            user_group = user_group.options(FromCache("sql_cache_short",
+                                    "get_users_group_%s" % user_group_id))
+        return user_group.get(user_group_id)
+
+    def permissions(self, with_admins=True, with_owner=True):
+        q = UserUserGroupToPerm.query().filter(UserUserGroupToPerm.user_group == self)
+        q = q.options(joinedload(UserUserGroupToPerm.user_group),
+                      joinedload(UserUserGroupToPerm.user),
+                      joinedload(UserUserGroupToPerm.permission),)
+
+        # get owners and admins and permissions. We do a trick of re-writing
+        # objects from sqlalchemy to named-tuples due to sqlalchemy session
+        # has a global reference and changing one object propagates to all
+        # others. This means if admin is also an owner admin_row that change
+        # would propagate to both objects
+        perm_rows = []
+        for _usr in q.all():
+            usr = AttributeDict(_usr.user.get_dict())
+            usr.permission = _usr.permission.permission_name
+            perm_rows.append(usr)
+
+        # filter the perm rows by 'default' first and then sort them by
+        # admin,write,read,none permissions sorted again alphabetically in
+        # each group
+        perm_rows = sorted(perm_rows, key=display_sort)
+
+        _admin_perm = 'usergroup.admin'
+        owner_row = []
+        if with_owner:
+            usr = AttributeDict(self.user.get_dict())
+            usr.owner_row = True
+            usr.permission = _admin_perm
+            owner_row.append(usr)
+
+        super_admin_rows = []
+        if with_admins:
+            for usr in User.get_all_super_admins():
+                # if this admin is also owner, don't double the record
+                if usr.user_id == owner_row[0].user_id:
+                    owner_row[0].admin_row = True
+                else:
+                    usr = AttributeDict(usr.get_dict())
+                    usr.admin_row = True
+                    usr.permission = _admin_perm
+                    super_admin_rows.append(usr)
+
+        return super_admin_rows + owner_row + perm_rows
+
+    def permission_user_groups(self):
+        q = UserGroupUserGroupToPerm.query().filter(UserGroupUserGroupToPerm.target_user_group == self)
+        q = q.options(joinedload(UserGroupUserGroupToPerm.user_group),
+                      joinedload(UserGroupUserGroupToPerm.target_user_group),
+                      joinedload(UserGroupUserGroupToPerm.permission),)
+
+        perm_rows = []
+        for _user_group in q.all():
+            usr = AttributeDict(_user_group.user_group.get_dict())
+            usr.permission = _user_group.permission.permission_name
+            perm_rows.append(usr)
+
+        return perm_rows
+
+    def _get_default_perms(self, user_group, suffix=''):
+        from rhodecode.model.permission import PermissionModel
+        return PermissionModel().get_default_perms(user_group.users_group_to_perm, suffix)
+
+    def get_default_perms(self, suffix=''):
+        return self._get_default_perms(self, suffix)
+
+    def get_api_data(self, with_group_members=True, include_secrets=False):
+        """
+        :param include_secrets: See :meth:`User.get_api_data`, this parameter is
+           basically forwarded.
+
+        """
+        user_group = self
+
+        data = {
+            'users_group_id': user_group.users_group_id,
+            'group_name': user_group.users_group_name,
+            'group_description': user_group.user_group_description,
+            'active': user_group.users_group_active,
+            'owner': user_group.user.username,
+        }
+        if with_group_members:
+            users = []
+            for user in user_group.members:
+                user = user.user
+                users.append(user.get_api_data(include_secrets=include_secrets))
+            data['users'] = users
+
+        return data
+
+
+class UserGroupMember(Base, BaseModel):
+    __tablename__ = 'users_groups_members'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
+
+    user = relationship('User', lazy='joined')
+    users_group = relationship('UserGroup')
+
+    def __init__(self, gr_id='', u_id=''):
+        self.users_group_id = gr_id
+        self.user_id = u_id
+
+
+class RepositoryField(Base, BaseModel):
+    __tablename__ = 'repositories_fields'
+    __table_args__ = (
+        UniqueConstraint('repository_id', 'field_key'),  # no-multi field
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    PREFIX = 'ex_'  # prefix used in form to not conflict with already existing fields
+
+    repo_field_id = Column("repo_field_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
+    field_key = Column("field_key", String(250))
+    field_label = Column("field_label", String(1024), nullable=False)
+    field_value = Column("field_value", String(10000), nullable=False)
+    field_desc = Column("field_desc", String(1024), nullable=False)
+    field_type = Column("field_type", String(255), nullable=False, unique=None)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+
+    repository = relationship('Repository')
+
+    @property
+    def field_key_prefixed(self):
+        return 'ex_%s' % self.field_key
+
+    @classmethod
+    def un_prefix_key(cls, key):
+        if key.startswith(cls.PREFIX):
+            return key[len(cls.PREFIX):]
+        return key
+
+    @classmethod
+    def get_by_key_name(cls, key, repo):
+        row = cls.query()\
+                .filter(cls.repository == repo)\
+                .filter(cls.field_key == key).scalar()
+        return row
+
+
+class Repository(Base, BaseModel):
+    __tablename__ = 'repositories'
+    __table_args__ = (
+        Index('r_repo_name_idx', 'repo_name', mysql_length=255),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}'
+    DEFAULT_CLONE_URI_ID = '{scheme}://{user}@{netloc}/_{repoid}'
+
+    STATE_CREATED = 'repo_state_created'
+    STATE_PENDING = 'repo_state_pending'
+    STATE_ERROR = 'repo_state_error'
+
+    LOCK_AUTOMATIC = 'lock_auto'
+    LOCK_API = 'lock_api'
+    LOCK_WEB = 'lock_web'
+    LOCK_PULL = 'lock_pull'
+
+    NAME_SEP = URL_SEP
+
+    repo_id = Column(
+        "repo_id", Integer(), nullable=False, unique=True, default=None,
+        primary_key=True)
+    _repo_name = Column(
+        "repo_name", Text(), nullable=False, default=None)
+    _repo_name_hash = Column(
+        "repo_name_hash", String(255), nullable=False, unique=True)
+    repo_state = Column("repo_state", String(255), nullable=True)
+
+    clone_uri = Column(
+        "clone_uri", EncryptedTextValue(), nullable=True, unique=False,
+        default=None)
+    repo_type = Column(
+        "repo_type", String(255), nullable=False, unique=False, default=None)
+    user_id = Column(
+        "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
+        unique=False, default=None)
+    private = Column(
+        "private", Boolean(), nullable=True, unique=None, default=None)
+    enable_statistics = Column(
+        "statistics", Boolean(), nullable=True, unique=None, default=True)
+    enable_downloads = Column(
+        "downloads", Boolean(), nullable=True, unique=None, default=True)
+    description = Column(
+        "description", String(10000), nullable=True, unique=None, default=None)
+    created_on = Column(
+        'created_on', DateTime(timezone=False), nullable=True, unique=None,
+        default=datetime.datetime.now)
+    updated_on = Column(
+        'updated_on', DateTime(timezone=False), nullable=True, unique=None,
+        default=datetime.datetime.now)
+    _landing_revision = Column(
+        "landing_revision", String(255), nullable=False, unique=False,
+        default=None)
+    enable_locking = Column(
+        "enable_locking", Boolean(), nullable=False, unique=None,
+        default=False)
+    _locked = Column(
+        "locked", String(255), nullable=True, unique=False, default=None)
+    _changeset_cache = Column(
+        "changeset_cache", LargeBinary(), nullable=True)  # JSON data
+
+    fork_id = Column(
+        "fork_id", Integer(), ForeignKey('repositories.repo_id'),
+        nullable=True, unique=False, default=None)
+    group_id = Column(
+        "group_id", Integer(), ForeignKey('groups.group_id'), nullable=True,
+        unique=False, default=None)
+
+    user = relationship('User', lazy='joined')
+    fork = relationship('Repository', remote_side=repo_id, lazy='joined')
+    group = relationship('RepoGroup', lazy='joined')
+    repo_to_perm = relationship(
+        'UserRepoToPerm', cascade='all',
+        order_by='UserRepoToPerm.repo_to_perm_id')
+    users_group_to_perm = relationship('UserGroupRepoToPerm', cascade='all')
+    stats = relationship('Statistics', cascade='all', uselist=False)
+
+    followers = relationship(
+        'UserFollowing',
+        primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id',
+        cascade='all')
+    extra_fields = relationship(
+        'RepositoryField', cascade="all, delete, delete-orphan")
+    logs = relationship('UserLog')
+    comments = relationship(
+        'ChangesetComment', cascade="all, delete, delete-orphan")
+    pull_requests_source = relationship(
+        'PullRequest',
+        primaryjoin='PullRequest.source_repo_id==Repository.repo_id',
+        cascade="all, delete, delete-orphan")
+    pull_requests_target = relationship(
+        'PullRequest',
+        primaryjoin='PullRequest.target_repo_id==Repository.repo_id',
+        cascade="all, delete, delete-orphan")
+    ui = relationship('RepoRhodeCodeUi', cascade="all")
+    settings = relationship('RepoRhodeCodeSetting', cascade="all")
+
+    def __unicode__(self):
+        return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id,
+                                   safe_unicode(self.repo_name))
+
+    @hybrid_property
+    def landing_rev(self):
+        # always should return [rev_type, rev]
+        if self._landing_revision:
+            _rev_info = self._landing_revision.split(':')
+            if len(_rev_info) < 2:
+                _rev_info.insert(0, 'rev')
+            return [_rev_info[0], _rev_info[1]]
+        return [None, None]
+
+    @landing_rev.setter
+    def landing_rev(self, val):
+        if ':' not in val:
+            raise ValueError('value must be delimited with `:` and consist '
+                             'of <rev_type>:<rev>, got %s instead' % val)
+        self._landing_revision = val
+
+    @hybrid_property
+    def locked(self):
+        if self._locked:
+            user_id, timelocked, reason = self._locked.split(':')
+            lock_values = int(user_id), timelocked, reason
+        else:
+            lock_values = [None, None, None]
+        return lock_values
+
+    @locked.setter
+    def locked(self, val):
+        if val and isinstance(val, (list, tuple)):
+            self._locked = ':'.join(map(str, val))
+        else:
+            self._locked = None
+
+    @hybrid_property
+    def changeset_cache(self):
+        from rhodecode.lib.vcs.backends.base import EmptyCommit
+        dummy = EmptyCommit().__json__()
+        if not self._changeset_cache:
+            return dummy
+        try:
+            return json.loads(self._changeset_cache)
+        except TypeError:
+            return dummy
+        except Exception:
+            log.error(traceback.format_exc())
+            return dummy
+
+    @changeset_cache.setter
+    def changeset_cache(self, val):
+        try:
+            self._changeset_cache = json.dumps(val)
+        except Exception:
+            log.error(traceback.format_exc())
+
+    @hybrid_property
+    def repo_name(self):
+        return self._repo_name
+
+    @repo_name.setter
+    def repo_name(self, value):
+        self._repo_name = value
+        self._repo_name_hash = hashlib.sha1(safe_str(value)).hexdigest()
+
+    @classmethod
+    def normalize_repo_name(cls, repo_name):
+        """
+        Normalizes os specific repo_name to the format internally stored inside
+        database using URL_SEP
+
+        :param cls:
+        :param repo_name:
+        """
+        return cls.NAME_SEP.join(repo_name.split(os.sep))
+
+    @classmethod
+    def get_by_repo_name(cls, repo_name, cache=False, identity_cache=False):
+        session = Session()
+        q = session.query(cls).filter(cls.repo_name == repo_name)
+
+        if cache:
+            if identity_cache:
+                val = cls.identity_cache(session, 'repo_name', repo_name)
+                if val:
+                    return val
+            else:
+                q = q.options(
+                    FromCache("sql_cache_short",
+                              "get_repo_by_name_%s" % _hash_key(repo_name)))
+
+        return q.scalar()
+
+    @classmethod
+    def get_by_full_path(cls, repo_full_path):
+        repo_name = repo_full_path.split(cls.base_path(), 1)[-1]
+        repo_name = cls.normalize_repo_name(repo_name)
+        return cls.get_by_repo_name(repo_name.strip(URL_SEP))
+
+    @classmethod
+    def get_repo_forks(cls, repo_id):
+        return cls.query().filter(Repository.fork_id == repo_id)
+
+    @classmethod
+    def base_path(cls):
+        """
+        Returns base path when all repos are stored
+
+        :param cls:
+        """
+        q = Session().query(RhodeCodeUi)\
+            .filter(RhodeCodeUi.ui_key == cls.NAME_SEP)
+        q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
+        return q.one().ui_value
+
+    @classmethod
+    def is_valid(cls, repo_name):
+        """
+        returns True if given repo name is a valid filesystem repository
+
+        :param cls:
+        :param repo_name:
+        """
+        from rhodecode.lib.utils import is_valid_repo
+
+        return is_valid_repo(repo_name, cls.base_path())
+
+    @classmethod
+    def get_all_repos(cls, user_id=Optional(None), group_id=Optional(None),
+                      case_insensitive=True):
+        q = Repository.query()
+
+        if not isinstance(user_id, Optional):
+            q = q.filter(Repository.user_id == user_id)
+
+        if not isinstance(group_id, Optional):
+            q = q.filter(Repository.group_id == group_id)
+
+        if case_insensitive:
+            q = q.order_by(func.lower(Repository.repo_name))
+        else:
+            q = q.order_by(Repository.repo_name)
+        return q.all()
+
+    @property
+    def forks(self):
+        """
+        Return forks of this repo
+        """
+        return Repository.get_repo_forks(self.repo_id)
+
+    @property
+    def parent(self):
+        """
+        Returns fork parent
+        """
+        return self.fork
+
+    @property
+    def just_name(self):
+        return self.repo_name.split(self.NAME_SEP)[-1]
+
+    @property
+    def groups_with_parents(self):
+        groups = []
+        if self.group is None:
+            return groups
+
+        cur_gr = self.group
+        groups.insert(0, cur_gr)
+        while 1:
+            gr = getattr(cur_gr, 'parent_group', None)
+            cur_gr = cur_gr.parent_group
+            if gr is None:
+                break
+            groups.insert(0, gr)
+
+        return groups
+
+    @property
+    def groups_and_repo(self):
+        return self.groups_with_parents, self
+
+    @LazyProperty
+    def repo_path(self):
+        """
+        Returns base full path for that repository means where it actually
+        exists on a filesystem
+        """
+        q = Session().query(RhodeCodeUi).filter(
+            RhodeCodeUi.ui_key == self.NAME_SEP)
+        q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
+        return q.one().ui_value
+
+    @property
+    def repo_full_path(self):
+        p = [self.repo_path]
+        # we need to split the name by / since this is how we store the
+        # names in the database, but that eventually needs to be converted
+        # into a valid system path
+        p += self.repo_name.split(self.NAME_SEP)
+        return os.path.join(*map(safe_unicode, p))
+
+    @property
+    def cache_keys(self):
+        """
+        Returns associated cache keys for that repo
+        """
+        return CacheKey.query()\
+            .filter(CacheKey.cache_args == self.repo_name)\
+            .order_by(CacheKey.cache_key)\
+            .all()
+
+    def get_new_name(self, repo_name):
+        """
+        returns new full repository name based on assigned group and new new
+
+        :param group_name:
+        """
+        path_prefix = self.group.full_path_splitted if self.group else []
+        return self.NAME_SEP.join(path_prefix + [repo_name])
+
+    @property
+    def _config(self):
+        """
+        Returns db based config object.
+        """
+        from rhodecode.lib.utils import make_db_config
+        return make_db_config(clear_session=False, repo=self)
+
+    def permissions(self, with_admins=True, with_owner=True):
+        q = UserRepoToPerm.query().filter(UserRepoToPerm.repository == self)
+        q = q.options(joinedload(UserRepoToPerm.repository),
+                      joinedload(UserRepoToPerm.user),
+                      joinedload(UserRepoToPerm.permission),)
+
+        # get owners and admins and permissions. We do a trick of re-writing
+        # objects from sqlalchemy to named-tuples due to sqlalchemy session
+        # has a global reference and changing one object propagates to all
+        # others. This means if admin is also an owner admin_row that change
+        # would propagate to both objects
+        perm_rows = []
+        for _usr in q.all():
+            usr = AttributeDict(_usr.user.get_dict())
+            usr.permission = _usr.permission.permission_name
+            perm_rows.append(usr)
+
+        # filter the perm rows by 'default' first and then sort them by
+        # admin,write,read,none permissions sorted again alphabetically in
+        # each group
+        perm_rows = sorted(perm_rows, key=display_sort)
+
+        _admin_perm = 'repository.admin'
+        owner_row = []
+        if with_owner:
+            usr = AttributeDict(self.user.get_dict())
+            usr.owner_row = True
+            usr.permission = _admin_perm
+            owner_row.append(usr)
+
+        super_admin_rows = []
+        if with_admins:
+            for usr in User.get_all_super_admins():
+                # if this admin is also owner, don't double the record
+                if usr.user_id == owner_row[0].user_id:
+                    owner_row[0].admin_row = True
+                else:
+                    usr = AttributeDict(usr.get_dict())
+                    usr.admin_row = True
+                    usr.permission = _admin_perm
+                    super_admin_rows.append(usr)
+
+        return super_admin_rows + owner_row + perm_rows
+
+    def permission_user_groups(self):
+        q = UserGroupRepoToPerm.query().filter(
+            UserGroupRepoToPerm.repository == self)
+        q = q.options(joinedload(UserGroupRepoToPerm.repository),
+                      joinedload(UserGroupRepoToPerm.users_group),
+                      joinedload(UserGroupRepoToPerm.permission),)
+
+        perm_rows = []
+        for _user_group in q.all():
+            usr = AttributeDict(_user_group.users_group.get_dict())
+            usr.permission = _user_group.permission.permission_name
+            perm_rows.append(usr)
+
+        return perm_rows
+
+    def get_api_data(self, include_secrets=False):
+        """
+        Common function for generating repo api data
+
+        :param include_secrets: See :meth:`User.get_api_data`.
+
+        """
+        # TODO: mikhail: Here there is an anti-pattern, we probably need to
+        # move this methods on models level.
+        from rhodecode.model.settings import SettingsModel
+
+        repo = self
+        _user_id, _time, _reason = self.locked
+
+        data = {
+            'repo_id': repo.repo_id,
+            'repo_name': repo.repo_name,
+            'repo_type': repo.repo_type,
+            'clone_uri': repo.clone_uri or '',
+            'url': url('summary_home', repo_name=self.repo_name, qualified=True),
+            'private': repo.private,
+            'created_on': repo.created_on,
+            'description': repo.description,
+            'landing_rev': repo.landing_rev,
+            'owner': repo.user.username,
+            'fork_of': repo.fork.repo_name if repo.fork else None,
+            'enable_statistics': repo.enable_statistics,
+            'enable_locking': repo.enable_locking,
+            'enable_downloads': repo.enable_downloads,
+            'last_changeset': repo.changeset_cache,
+            'locked_by': User.get(_user_id).get_api_data(
+                include_secrets=include_secrets) if _user_id else None,
+            'locked_date': time_to_datetime(_time) if _time else None,
+            'lock_reason': _reason if _reason else None,
+        }
+
+        # TODO: mikhail: should be per-repo settings here
+        rc_config = SettingsModel().get_all_settings()
+        repository_fields = str2bool(
+            rc_config.get('rhodecode_repository_fields'))
+        if repository_fields:
+            for f in self.extra_fields:
+                data[f.field_key_prefixed] = f.field_value
+
+        return data
+
+    @classmethod
+    def lock(cls, repo, user_id, lock_time=None, lock_reason=None):
+        if not lock_time:
+            lock_time = time.time()
+        if not lock_reason:
+            lock_reason = cls.LOCK_AUTOMATIC
+        repo.locked = [user_id, lock_time, lock_reason]
+        Session().add(repo)
+        Session().commit()
+
+    @classmethod
+    def unlock(cls, repo):
+        repo.locked = None
+        Session().add(repo)
+        Session().commit()
+
+    @classmethod
+    def getlock(cls, repo):
+        return repo.locked
+
+    def is_user_lock(self, user_id):
+        if self.lock[0]:
+            lock_user_id = safe_int(self.lock[0])
+            user_id = safe_int(user_id)
+            # both are ints, and they are equal
+            return all([lock_user_id, user_id]) and lock_user_id == user_id
+
+        return False
+
+    def get_locking_state(self, action, user_id, only_when_enabled=True):
+        """
+        Checks locking on this repository, if locking is enabled and lock is
+        present returns a tuple of make_lock, locked, locked_by.
+        make_lock can have 3 states None (do nothing) True, make lock
+        False release lock, This value is later propagated to hooks, which
+        do the locking. Think about this as signals passed to hooks what to do.
+
+        """
+        # TODO: johbo: This is part of the business logic and should be moved
+        # into the RepositoryModel.
+
+        if action not in ('push', 'pull'):
+            raise ValueError("Invalid action value: %s" % repr(action))
+
+        # defines if locked error should be thrown to user
+        currently_locked = False
+        # defines if new lock should be made, tri-state
+        make_lock = None
+        repo = self
+        user = User.get(user_id)
+
+        lock_info = repo.locked
+
+        if repo and (repo.enable_locking or not only_when_enabled):
+            if action == 'push':
+                # check if it's already locked !, if it is compare users
+                locked_by_user_id = lock_info[0]
+                if user.user_id == locked_by_user_id:
+                    log.debug(
+                        'Got `push` action from user %s, now unlocking', user)
+                    # unlock if we have push from user who locked
+                    make_lock = False
+                else:
+                    # we're not the same user who locked, ban with
+                    # code defined in settings (default is 423 HTTP Locked) !
+                    log.debug('Repo %s is currently locked by %s', repo, user)
+                    currently_locked = True
+            elif action == 'pull':
+                # [0] user [1] date
+                if lock_info[0] and lock_info[1]:
+                    log.debug('Repo %s is currently locked by %s', repo, user)
+                    currently_locked = True
+                else:
+                    log.debug('Setting lock on repo %s by %s', repo, user)
+                    make_lock = True
+
+        else:
+            log.debug('Repository %s do not have locking enabled', repo)
+
+        log.debug('FINAL locking values make_lock:%s,locked:%s,locked_by:%s',
+                  make_lock, currently_locked, lock_info)
+
+        from rhodecode.lib.auth import HasRepoPermissionAny
+        perm_check = HasRepoPermissionAny('repository.write', 'repository.admin')
+        if make_lock and not perm_check(repo_name=repo.repo_name, user=user):
+            # if we don't have at least write permission we cannot make a lock
+            log.debug('lock state reset back to FALSE due to lack '
+                      'of at least read permission')
+            make_lock = False
+
+        return make_lock, currently_locked, lock_info
+
+    @property
+    def last_db_change(self):
+        return self.updated_on
+
+    @property
+    def clone_uri_hidden(self):
+        clone_uri = self.clone_uri
+        if clone_uri:
+            import urlobject
+            url_obj = urlobject.URLObject(clone_uri)
+            if url_obj.password:
+                clone_uri = url_obj.with_password('*****')
+        return clone_uri
+
+    def clone_url(self, **override):
+        qualified_home_url = url('home', qualified=True)
+
+        uri_tmpl = None
+        if 'with_id' in override:
+            uri_tmpl = self.DEFAULT_CLONE_URI_ID
+            del override['with_id']
+
+        if 'uri_tmpl' in override:
+            uri_tmpl = override['uri_tmpl']
+            del override['uri_tmpl']
+
+        # we didn't override our tmpl from **overrides
+        if not uri_tmpl:
+            uri_tmpl = self.DEFAULT_CLONE_URI
+            try:
+                from pylons import tmpl_context as c
+                uri_tmpl = c.clone_uri_tmpl
+            except Exception:
+                # in any case if we call this outside of request context,
+                # ie, not having tmpl_context set up
+                pass
+
+        return get_clone_url(uri_tmpl=uri_tmpl,
+                             qualifed_home_url=qualified_home_url,
+                             repo_name=self.repo_name,
+                             repo_id=self.repo_id, **override)
+
+    def set_state(self, state):
+        self.repo_state = state
+        Session().add(self)
+    #==========================================================================
+    # SCM PROPERTIES
+    #==========================================================================
+
+    def get_commit(self, commit_id=None, commit_idx=None, pre_load=None):
+        return get_commit_safe(
+            self.scm_instance(), commit_id, commit_idx, pre_load=pre_load)
+
+    def get_changeset(self, rev=None, pre_load=None):
+        warnings.warn("Use get_commit", DeprecationWarning)
+        commit_id = None
+        commit_idx = None
+        if isinstance(rev, basestring):
+            commit_id = rev
+        else:
+            commit_idx = rev
+        return self.get_commit(commit_id=commit_id, commit_idx=commit_idx,
+                               pre_load=pre_load)
+
+    def get_landing_commit(self):
+        """
+        Returns landing commit, or if that doesn't exist returns the tip
+        """
+        _rev_type, _rev = self.landing_rev
+        commit = self.get_commit(_rev)
+        if isinstance(commit, EmptyCommit):
+            return self.get_commit()
+        return commit
+
+    def update_commit_cache(self, cs_cache=None, config=None):
+        """
+        Update cache of last changeset for repository, keys should be::
+
+            short_id
+            raw_id
+            revision
+            parents
+            message
+            date
+            author
+
+        :param cs_cache:
+        """
+        from rhodecode.lib.vcs.backends.base import BaseChangeset
+        if cs_cache is None:
+            # use no-cache version here
+            scm_repo = self.scm_instance(cache=False, config=config)
+            if scm_repo:
+                cs_cache = scm_repo.get_commit(
+                    pre_load=["author", "date", "message", "parents"])
+            else:
+                cs_cache = EmptyCommit()
+
+        if isinstance(cs_cache, BaseChangeset):
+            cs_cache = cs_cache.__json__()
+
+        def is_outdated(new_cs_cache):
+            if (new_cs_cache['raw_id'] != self.changeset_cache['raw_id'] or
+                new_cs_cache['revision'] != self.changeset_cache['revision']):
+                return True
+            return False
+
+        # check if we have maybe already latest cached revision
+        if is_outdated(cs_cache) or not self.changeset_cache:
+            _default = datetime.datetime.fromtimestamp(0)
+            last_change = cs_cache.get('date') or _default
+            log.debug('updated repo %s with new cs cache %s',
+                      self.repo_name, cs_cache)
+            self.updated_on = last_change
+            self.changeset_cache = cs_cache
+            Session().add(self)
+            Session().commit()
+        else:
+            log.debug('Skipping update_commit_cache for repo:`%s` '
+                      'commit already with latest changes', self.repo_name)
+
+    @property
+    def tip(self):
+        return self.get_commit('tip')
+
+    @property
+    def author(self):
+        return self.tip.author
+
+    @property
+    def last_change(self):
+        return self.scm_instance().last_change
+
+    def get_comments(self, revisions=None):
+        """
+        Returns comments for this repository grouped by revisions
+
+        :param revisions: filter query by revisions only
+        """
+        cmts = ChangesetComment.query()\
+            .filter(ChangesetComment.repo == self)
+        if revisions:
+            cmts = cmts.filter(ChangesetComment.revision.in_(revisions))
+        grouped = collections.defaultdict(list)
+        for cmt in cmts.all():
+            grouped[cmt.revision].append(cmt)
+        return grouped
+
+    def statuses(self, revisions=None):
+        """
+        Returns statuses for this repository
+
+        :param revisions: list of revisions to get statuses for
+        """
+        statuses = ChangesetStatus.query()\
+            .filter(ChangesetStatus.repo == self)\
+            .filter(ChangesetStatus.version == 0)
+
+        if revisions:
+            # Try doing the filtering in chunks to avoid hitting limits
+            size = 500
+            status_results = []
+            for chunk in xrange(0, len(revisions), size):
+                status_results += statuses.filter(
+                    ChangesetStatus.revision.in_(
+                        revisions[chunk: chunk+size])
+                ).all()
+        else:
+            status_results = statuses.all()
+
+        grouped = {}
+
+        # maybe we have open new pullrequest without a status?
+        stat = ChangesetStatus.STATUS_UNDER_REVIEW
+        status_lbl = ChangesetStatus.get_status_lbl(stat)
+        for pr in PullRequest.query().filter(PullRequest.source_repo == self).all():
+            for rev in pr.revisions:
+                pr_id = pr.pull_request_id
+                pr_repo = pr.target_repo.repo_name
+                grouped[rev] = [stat, status_lbl, pr_id, pr_repo]
+
+        for stat in status_results:
+            pr_id = pr_repo = None
+            if stat.pull_request:
+                pr_id = stat.pull_request.pull_request_id
+                pr_repo = stat.pull_request.target_repo.repo_name
+            grouped[stat.revision] = [str(stat.status), stat.status_lbl,
+                                      pr_id, pr_repo]
+        return grouped
+
+    # ==========================================================================
+    # SCM CACHE INSTANCE
+    # ==========================================================================
+
+    def scm_instance(self, **kwargs):
+        import rhodecode
+
+        # Passing a config will not hit the cache currently only used
+        # for repo2dbmapper
+        config = kwargs.pop('config', None)
+        cache = kwargs.pop('cache', None)
+        full_cache = str2bool(rhodecode.CONFIG.get('vcs_full_cache'))
+        # if cache is NOT defined use default global, else we have a full
+        # control over cache behaviour
+        if cache is None and full_cache and not config:
+            return self._get_instance_cached()
+        return self._get_instance(cache=bool(cache), config=config)
+
+    def _get_instance_cached(self):
+        @cache_region('long_term')
+        def _get_repo(cache_key):
+            return self._get_instance()
+
+        invalidator_context = CacheKey.repo_context_cache(
+            _get_repo, self.repo_name, None)
+
+        with invalidator_context as context:
+            context.invalidate()
+            repo = context.compute()
+
+        return repo
+
+    def _get_instance(self, cache=True, config=None):
+        repo_full_path = self.repo_full_path
+        try:
+            vcs_alias = get_scm(repo_full_path)[0]
+            log.debug(
+                'Creating instance of %s repository from %s',
+                vcs_alias, repo_full_path)
+            backend = get_backend(vcs_alias)
+        except VCSError:
+            log.exception(
+                'Perhaps this repository is in db and not in '
+                'filesystem run rescan repositories with '
+                '"destroy old data" option from admin panel')
+            return
+
+        config = config or self._config
+        custom_wire = {
+            'cache': cache  # controls the vcs.remote cache
+        }
+        repo = backend(
+            safe_str(repo_full_path), config=config, create=False,
+            with_wire=custom_wire)
+
+        return repo
+
+    def __json__(self):
+        return {'landing_rev': self.landing_rev}
+
+    def get_dict(self):
+
+        # Since we transformed `repo_name` to a hybrid property, we need to
+        # keep compatibility with the code which uses `repo_name` field.
+
+        result = super(Repository, self).get_dict()
+        result['repo_name'] = result.pop('_repo_name', None)
+        return result
+
+
+class RepoGroup(Base, BaseModel):
+    __tablename__ = 'groups'
+    __table_args__ = (
+        UniqueConstraint('group_name', 'group_parent_id'),
+        CheckConstraint('group_id != group_parent_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    __mapper_args__ = {'order_by': 'group_name'}
+
+    CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
+
+    group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
+    group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
+    group_description = Column("group_description", String(10000), nullable=True, unique=None, default=None)
+    enable_locking = Column("enable_locking", Boolean(), nullable=False, unique=None, default=False)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+
+    repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')
+    users_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
+    parent_group = relationship('RepoGroup', remote_side=group_id)
+    user = relationship('User')
+
+    def __init__(self, group_name='', parent_group=None):
+        self.group_name = group_name
+        self.parent_group = parent_group
+
+    def __unicode__(self):
+        return u"<%s('id:%s:%s')>" % (self.__class__.__name__, self.group_id,
+                                      self.group_name)
+
+    @classmethod
+    def _generate_choice(cls, repo_group):
+        from webhelpers.html import literal as _literal
+        _name = lambda k: _literal(cls.CHOICES_SEPARATOR.join(k))
+        return repo_group.group_id, _name(repo_group.full_path_splitted)
+
+    @classmethod
+    def groups_choices(cls, groups=None, show_empty_group=True):
+        if not groups:
+            groups = cls.query().all()
+
+        repo_groups = []
+        if show_empty_group:
+            repo_groups = [('-1', u'-- %s --' % _('No parent'))]
+
+        repo_groups.extend([cls._generate_choice(x) for x in groups])
+
+        repo_groups = sorted(
+            repo_groups, key=lambda t: t[1].split(cls.CHOICES_SEPARATOR)[0])
+        return repo_groups
+
+    @classmethod
+    def url_sep(cls):
+        return URL_SEP
+
+    @classmethod
+    def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
+        if case_insensitive:
+            gr = cls.query().filter(func.lower(cls.group_name)
+                                    == func.lower(group_name))
+        else:
+            gr = cls.query().filter(cls.group_name == group_name)
+        if cache:
+            gr = gr.options(FromCache(
+                            "sql_cache_short",
+                            "get_group_%s" % _hash_key(group_name)))
+        return gr.scalar()
+
+    @classmethod
+    def get_all_repo_groups(cls, user_id=Optional(None), group_id=Optional(None),
+                            case_insensitive=True):
+        q = RepoGroup.query()
+
+        if not isinstance(user_id, Optional):
+            q = q.filter(RepoGroup.user_id == user_id)
+
+        if not isinstance(group_id, Optional):
+            q = q.filter(RepoGroup.group_parent_id == group_id)
+
+        if case_insensitive:
+            q = q.order_by(func.lower(RepoGroup.group_name))
+        else:
+            q = q.order_by(RepoGroup.group_name)
+        return q.all()
+
+    @property
+    def parents(self):
+        parents_recursion_limit = 10
+        groups = []
+        if self.parent_group is None:
+            return groups
+        cur_gr = self.parent_group
+        groups.insert(0, cur_gr)
+        cnt = 0
+        while 1:
+            cnt += 1
+            gr = getattr(cur_gr, 'parent_group', None)
+            cur_gr = cur_gr.parent_group
+            if gr is None:
+                break
+            if cnt == parents_recursion_limit:
+                # this will prevent accidental infinit loops
+                log.error(('more than %s parents found for group %s, stopping '
+                           'recursive parent fetching' % (parents_recursion_limit, self)))
+                break
+
+            groups.insert(0, gr)
+        return groups
+
+    @property
+    def children(self):
+        return RepoGroup.query().filter(RepoGroup.parent_group == self)
+
+    @property
+    def name(self):
+        return self.group_name.split(RepoGroup.url_sep())[-1]
+
+    @property
+    def full_path(self):
+        return self.group_name
+
+    @property
+    def full_path_splitted(self):
+        return self.group_name.split(RepoGroup.url_sep())
+
+    @property
+    def repositories(self):
+        return Repository.query()\
+                .filter(Repository.group == self)\
+                .order_by(Repository.repo_name)
+
+    @property
+    def repositories_recursive_count(self):
+        cnt = self.repositories.count()
+
+        def children_count(group):
+            cnt = 0
+            for child in group.children:
+                cnt += child.repositories.count()
+                cnt += children_count(child)
+            return cnt
+
+        return cnt + children_count(self)
+
+    def _recursive_objects(self, include_repos=True):
+        all_ = []
+
+        def _get_members(root_gr):
+            if include_repos:
+                for r in root_gr.repositories:
+                    all_.append(r)
+            childs = root_gr.children.all()
+            if childs:
+                for gr in childs:
+                    all_.append(gr)
+                    _get_members(gr)
+
+        _get_members(self)
+        return [self] + all_
+
+    def recursive_groups_and_repos(self):
+        """
+        Recursive return all groups, with repositories in those groups
+        """
+        return self._recursive_objects()
+
+    def recursive_groups(self):
+        """
+        Returns all children groups for this group including children of children
+        """
+        return self._recursive_objects(include_repos=False)
+
+    def get_new_name(self, group_name):
+        """
+        returns new full group name based on parent and new name
+
+        :param group_name:
+        """
+        path_prefix = (self.parent_group.full_path_splitted if
+                       self.parent_group else [])
+        return RepoGroup.url_sep().join(path_prefix + [group_name])
+
+    def permissions(self, with_admins=True, with_owner=True):
+        q = UserRepoGroupToPerm.query().filter(UserRepoGroupToPerm.group == self)
+        q = q.options(joinedload(UserRepoGroupToPerm.group),
+                      joinedload(UserRepoGroupToPerm.user),
+                      joinedload(UserRepoGroupToPerm.permission),)
+
+        # get owners and admins and permissions. We do a trick of re-writing
+        # objects from sqlalchemy to named-tuples due to sqlalchemy session
+        # has a global reference and changing one object propagates to all
+        # others. This means if admin is also an owner admin_row that change
+        # would propagate to both objects
+        perm_rows = []
+        for _usr in q.all():
+            usr = AttributeDict(_usr.user.get_dict())
+            usr.permission = _usr.permission.permission_name
+            perm_rows.append(usr)
+
+        # filter the perm rows by 'default' first and then sort them by
+        # admin,write,read,none permissions sorted again alphabetically in
+        # each group
+        perm_rows = sorted(perm_rows, key=display_sort)
+
+        _admin_perm = 'group.admin'
+        owner_row = []
+        if with_owner:
+            usr = AttributeDict(self.user.get_dict())
+            usr.owner_row = True
+            usr.permission = _admin_perm
+            owner_row.append(usr)
+
+        super_admin_rows = []
+        if with_admins:
+            for usr in User.get_all_super_admins():
+                # if this admin is also owner, don't double the record
+                if usr.user_id == owner_row[0].user_id:
+                    owner_row[0].admin_row = True
+                else:
+                    usr = AttributeDict(usr.get_dict())
+                    usr.admin_row = True
+                    usr.permission = _admin_perm
+                    super_admin_rows.append(usr)
+
+        return super_admin_rows + owner_row + perm_rows
+
+    def permission_user_groups(self):
+        q = UserGroupRepoGroupToPerm.query().filter(UserGroupRepoGroupToPerm.group == self)
+        q = q.options(joinedload(UserGroupRepoGroupToPerm.group),
+                      joinedload(UserGroupRepoGroupToPerm.users_group),
+                      joinedload(UserGroupRepoGroupToPerm.permission),)
+
+        perm_rows = []
+        for _user_group in q.all():
+            usr = AttributeDict(_user_group.users_group.get_dict())
+            usr.permission = _user_group.permission.permission_name
+            perm_rows.append(usr)
+
+        return perm_rows
+
+    def get_api_data(self):
+        """
+        Common function for generating api data
+
+        """
+        group = self
+        data = {
+            'group_id': group.group_id,
+            'group_name': group.group_name,
+            'group_description': group.group_description,
+            'parent_group': group.parent_group.group_name if group.parent_group else None,
+            'repositories': [x.repo_name for x in group.repositories],
+            'owner': group.user.username,
+        }
+        return data
+
+
+class Permission(Base, BaseModel):
+    __tablename__ = 'permissions'
+    __table_args__ = (
+        Index('p_perm_name_idx', 'permission_name'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    PERMS = [
+        ('hg.admin', _('RhodeCode Super Administrator')),
+
+        ('repository.none', _('Repository no access')),
+        ('repository.read', _('Repository read access')),
+        ('repository.write', _('Repository write access')),
+        ('repository.admin', _('Repository admin access')),
+
+        ('group.none', _('Repository group no access')),
+        ('group.read', _('Repository group read access')),
+        ('group.write', _('Repository group write access')),
+        ('group.admin', _('Repository group admin access')),
+
+        ('usergroup.none', _('User group no access')),
+        ('usergroup.read', _('User group read access')),
+        ('usergroup.write', _('User group write access')),
+        ('usergroup.admin', _('User group admin access')),
+
+        ('hg.repogroup.create.false', _('Repository Group creation disabled')),
+        ('hg.repogroup.create.true', _('Repository Group creation enabled')),
+
+        ('hg.usergroup.create.false', _('User Group creation disabled')),
+        ('hg.usergroup.create.true', _('User Group creation enabled')),
+
+        ('hg.create.none', _('Repository creation disabled')),
+        ('hg.create.repository', _('Repository creation enabled')),
+        ('hg.create.write_on_repogroup.true', _('Repository creation enabled with write permission to a repository group')),
+        ('hg.create.write_on_repogroup.false', _('Repository creation disabled with write permission to a repository group')),
+
+        ('hg.fork.none', _('Repository forking disabled')),
+        ('hg.fork.repository', _('Repository forking enabled')),
+
+        ('hg.register.none', _('Registration disabled')),
+        ('hg.register.manual_activate', _('User Registration with manual account activation')),
+        ('hg.register.auto_activate', _('User Registration with automatic account activation')),
+
+        ('hg.extern_activate.manual', _('Manual activation of external account')),
+        ('hg.extern_activate.auto', _('Automatic activation of external account')),
+
+        ('hg.inherit_default_perms.false', _('Inherit object permissions from default user disabled')),
+        ('hg.inherit_default_perms.true', _('Inherit object permissions from default user enabled')),
+    ]
+
+    # definition of system default permissions for DEFAULT user
+    DEFAULT_USER_PERMISSIONS = [
+        'repository.read',
+        'group.read',
+        'usergroup.read',
+        'hg.create.repository',
+        'hg.repogroup.create.false',
+        'hg.usergroup.create.false',
+        'hg.create.write_on_repogroup.true',
+        'hg.fork.repository',
+        'hg.register.manual_activate',
+        'hg.extern_activate.auto',
+        'hg.inherit_default_perms.true',
+    ]
+
+    # defines which permissions are more important higher the more important
+    # Weight defines which permissions are more important.
+    # The higher number the more important.
+    PERM_WEIGHTS = {
+        'repository.none': 0,
+        'repository.read': 1,
+        'repository.write': 3,
+        'repository.admin': 4,
+
+        'group.none': 0,
+        'group.read': 1,
+        'group.write': 3,
+        'group.admin': 4,
+
+        'usergroup.none': 0,
+        'usergroup.read': 1,
+        'usergroup.write': 3,
+        'usergroup.admin': 4,
+
+        'hg.repogroup.create.false': 0,
+        'hg.repogroup.create.true': 1,
+
+        'hg.usergroup.create.false': 0,
+        'hg.usergroup.create.true': 1,
+
+        'hg.fork.none': 0,
+        'hg.fork.repository': 1,
+        'hg.create.none': 0,
+        'hg.create.repository': 1
+    }
+
+    permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    permission_name = Column("permission_name", String(255), nullable=True, unique=None, default=None)
+    permission_longname = Column("permission_longname", String(255), nullable=True, unique=None, default=None)
+
+    def __unicode__(self):
+        return u"<%s('%s:%s')>" % (
+            self.__class__.__name__, self.permission_id, self.permission_name
+        )
+
+    @classmethod
+    def get_by_key(cls, key):
+        return cls.query().filter(cls.permission_name == key).scalar()
+
+    @classmethod
+    def get_default_repo_perms(cls, user_id, repo_id=None):
+        q = Session().query(UserRepoToPerm, Repository, Permission)\
+            .join((Permission, UserRepoToPerm.permission_id == Permission.permission_id))\
+            .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\
+            .filter(UserRepoToPerm.user_id == user_id)
+        if repo_id:
+            q = q.filter(UserRepoToPerm.repository_id == repo_id)
+        return q.all()
+
+    @classmethod
+    def get_default_repo_perms_from_user_group(cls, user_id, repo_id=None):
+        q = Session().query(UserGroupRepoToPerm, Repository, Permission)\
+            .join(
+                Permission,
+                UserGroupRepoToPerm.permission_id == Permission.permission_id)\
+            .join(
+                Repository,
+                UserGroupRepoToPerm.repository_id == Repository.repo_id)\
+            .join(
+                UserGroup,
+                UserGroupRepoToPerm.users_group_id ==
+                UserGroup.users_group_id)\
+            .join(
+                UserGroupMember,
+                UserGroupRepoToPerm.users_group_id ==
+                UserGroupMember.users_group_id)\
+            .filter(
+                UserGroupMember.user_id == user_id,
+                UserGroup.users_group_active == true())
+        if repo_id:
+            q = q.filter(UserGroupRepoToPerm.repository_id == repo_id)
+        return q.all()
+
+    @classmethod
+    def get_default_group_perms(cls, user_id, repo_group_id=None):
+        q = Session().query(UserRepoGroupToPerm, RepoGroup, Permission)\
+            .join((Permission, UserRepoGroupToPerm.permission_id == Permission.permission_id))\
+            .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\
+            .filter(UserRepoGroupToPerm.user_id == user_id)
+        if repo_group_id:
+            q = q.filter(UserRepoGroupToPerm.group_id == repo_group_id)
+        return q.all()
+
+    @classmethod
+    def get_default_group_perms_from_user_group(
+            cls, user_id, repo_group_id=None):
+        q = Session().query(UserGroupRepoGroupToPerm, RepoGroup, Permission)\
+            .join(
+                Permission,
+                UserGroupRepoGroupToPerm.permission_id ==
+                Permission.permission_id)\
+            .join(
+                RepoGroup,
+                UserGroupRepoGroupToPerm.group_id == RepoGroup.group_id)\
+            .join(
+                UserGroup,
+                UserGroupRepoGroupToPerm.users_group_id ==
+                UserGroup.users_group_id)\
+            .join(
+                UserGroupMember,
+                UserGroupRepoGroupToPerm.users_group_id ==
+                UserGroupMember.users_group_id)\
+            .filter(
+                UserGroupMember.user_id == user_id,
+                UserGroup.users_group_active == true())
+        if repo_group_id:
+            q = q.filter(UserGroupRepoGroupToPerm.group_id == repo_group_id)
+        return q.all()
+
+    @classmethod
+    def get_default_user_group_perms(cls, user_id, user_group_id=None):
+        q = Session().query(UserUserGroupToPerm, UserGroup, Permission)\
+            .join((Permission, UserUserGroupToPerm.permission_id == Permission.permission_id))\
+            .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\
+            .filter(UserUserGroupToPerm.user_id == user_id)
+        if user_group_id:
+            q = q.filter(UserUserGroupToPerm.user_group_id == user_group_id)
+        return q.all()
+
+    @classmethod
+    def get_default_user_group_perms_from_user_group(
+            cls, user_id, user_group_id=None):
+        TargetUserGroup = aliased(UserGroup, name='target_user_group')
+        q = Session().query(UserGroupUserGroupToPerm, UserGroup, Permission)\
+            .join(
+                Permission,
+                UserGroupUserGroupToPerm.permission_id ==
+                Permission.permission_id)\
+            .join(
+                TargetUserGroup,
+                UserGroupUserGroupToPerm.target_user_group_id ==
+                TargetUserGroup.users_group_id)\
+            .join(
+                UserGroup,
+                UserGroupUserGroupToPerm.user_group_id ==
+                UserGroup.users_group_id)\
+            .join(
+                UserGroupMember,
+                UserGroupUserGroupToPerm.user_group_id ==
+                UserGroupMember.users_group_id)\
+            .filter(
+                UserGroupMember.user_id == user_id,
+                UserGroup.users_group_active == true())
+        if user_group_id:
+            q = q.filter(
+                UserGroupUserGroupToPerm.user_group_id == user_group_id)
+
+        return q.all()
+
+
+class UserRepoToPerm(Base, BaseModel):
+    __tablename__ = 'repo_to_perm'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'repository_id', 'permission_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
+
+    user = relationship('User')
+    repository = relationship('Repository')
+    permission = relationship('Permission')
+
+    @classmethod
+    def create(cls, user, repository, permission):
+        n = cls()
+        n.user = user
+        n.repository = repository
+        n.permission = permission
+        Session().add(n)
+        return n
+
+    def __unicode__(self):
+        return u'<%s => %s >' % (self.user, self.repository)
+
+
+class UserUserGroupToPerm(Base, BaseModel):
+    __tablename__ = 'user_user_group_to_perm'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'user_group_id', 'permission_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    user_user_group_to_perm_id = Column("user_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+    user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+
+    user = relationship('User')
+    user_group = relationship('UserGroup')
+    permission = relationship('Permission')
+
+    @classmethod
+    def create(cls, user, user_group, permission):
+        n = cls()
+        n.user = user
+        n.user_group = user_group
+        n.permission = permission
+        Session().add(n)
+        return n
+
+    def __unicode__(self):
+        return u'<%s => %s >' % (self.user, self.user_group)
+
+
+class UserToPerm(Base, BaseModel):
+    __tablename__ = 'user_to_perm'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'permission_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+
+    user = relationship('User')
+    permission = relationship('Permission', lazy='joined')
+
+    def __unicode__(self):
+        return u'<%s => %s >' % (self.user, self.permission)
+
+
+class UserGroupRepoToPerm(Base, BaseModel):
+    __tablename__ = 'users_group_repo_to_perm'
+    __table_args__ = (
+        UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
+
+    users_group = relationship('UserGroup')
+    permission = relationship('Permission')
+    repository = relationship('Repository')
+
+    @classmethod
+    def create(cls, users_group, repository, permission):
+        n = cls()
+        n.users_group = users_group
+        n.repository = repository
+        n.permission = permission
+        Session().add(n)
+        return n
+
+    def __unicode__(self):
+        return u'<UserGroupRepoToPerm:%s => %s >' % (self.users_group, self.repository)
+
+
+class UserGroupUserGroupToPerm(Base, BaseModel):
+    __tablename__ = 'user_group_user_group_to_perm'
+    __table_args__ = (
+        UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'),
+        CheckConstraint('target_user_group_id != user_group_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    user_group_user_group_to_perm_id = Column("user_group_user_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    target_user_group_id = Column("target_user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+    user_group_id = Column("user_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+
+    target_user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id')
+    user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.user_group_id==UserGroup.users_group_id')
+    permission = relationship('Permission')
+
+    @classmethod
+    def create(cls, target_user_group, user_group, permission):
+        n = cls()
+        n.target_user_group = target_user_group
+        n.user_group = user_group
+        n.permission = permission
+        Session().add(n)
+        return n
+
+    def __unicode__(self):
+        return u'<UserGroupUserGroup:%s => %s >' % (self.target_user_group, self.user_group)
+
+
+class UserGroupToPerm(Base, BaseModel):
+    __tablename__ = 'users_group_to_perm'
+    __table_args__ = (
+        UniqueConstraint('users_group_id', 'permission_id',),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+
+    users_group = relationship('UserGroup')
+    permission = relationship('Permission')
+
+
+class UserRepoGroupToPerm(Base, BaseModel):
+    __tablename__ = 'user_repo_group_to_perm'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'group_id', 'permission_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
+    group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+
+    user = relationship('User')
+    group = relationship('RepoGroup')
+    permission = relationship('Permission')
+
+    @classmethod
+    def create(cls, user, repository_group, permission):
+        n = cls()
+        n.user = user
+        n.group = repository_group
+        n.permission = permission
+        Session().add(n)
+        return n
+
+
+class UserGroupRepoGroupToPerm(Base, BaseModel):
+    __tablename__ = 'users_group_repo_group_to_perm'
+    __table_args__ = (
+        UniqueConstraint('users_group_id', 'group_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    users_group_repo_group_to_perm_id = Column("users_group_repo_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
+    group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
+    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
+
+    users_group = relationship('UserGroup')
+    permission = relationship('Permission')
+    group = relationship('RepoGroup')
+
+    @classmethod
+    def create(cls, user_group, repository_group, permission):
+        n = cls()
+        n.users_group = user_group
+        n.group = repository_group
+        n.permission = permission
+        Session().add(n)
+        return n
+
+    def __unicode__(self):
+        return u'<UserGroupRepoGroupToPerm:%s => %s >' % (self.users_group, self.group)
+
+
+class Statistics(Base, BaseModel):
+    __tablename__ = 'statistics'
+    __table_args__ = (
+         UniqueConstraint('repository_id'),
+         {'extend_existing': True, 'mysql_engine': 'InnoDB',
+          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
+    stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
+    commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data
+    commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data
+    languages = Column("languages", LargeBinary(1000000), nullable=False)#JSON data
+
+    repository = relationship('Repository', single_parent=True)
+
+
+class UserFollowing(Base, BaseModel):
+    __tablename__ = 'user_followings'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'follows_repository_id'),
+        UniqueConstraint('user_id', 'follows_user_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
+    follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None)
+    follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
+    follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
+
+    user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id')
+
+    follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')
+    follows_repository = relationship('Repository', order_by='Repository.repo_name')
+
+    @classmethod
+    def get_repo_followers(cls, repo_id):
+        return cls.query().filter(cls.follows_repo_id == repo_id)
+
+
+class CacheKey(Base, BaseModel):
+    __tablename__ = 'cache_invalidation'
+    __table_args__ = (
+        UniqueConstraint('cache_key'),
+        Index('key_idx', 'cache_key'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    CACHE_TYPE_ATOM = 'ATOM'
+    CACHE_TYPE_RSS = 'RSS'
+    CACHE_TYPE_README = 'README'
+
+    cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
+    cache_key = Column("cache_key", String(255), nullable=True, unique=None, default=None)
+    cache_args = Column("cache_args", String(255), nullable=True, unique=None, default=None)
+    cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False)
+
+    def __init__(self, cache_key, cache_args=''):
+        self.cache_key = cache_key
+        self.cache_args = cache_args
+        self.cache_active = False
+
+    def __unicode__(self):
+        return u"<%s('%s:%s[%s]')>" % (
+            self.__class__.__name__,
+            self.cache_id, self.cache_key, self.cache_active)
+
+    def _cache_key_partition(self):
+        prefix, repo_name, suffix = self.cache_key.partition(self.cache_args)
+        return prefix, repo_name, suffix
+
+    def get_prefix(self):
+        """
+        Try to extract prefix from existing cache key. The key could consist
+        of prefix, repo_name, suffix
+        """
+        # this returns prefix, repo_name, suffix
+        return self._cache_key_partition()[0]
+
+    def get_suffix(self):
+        """
+        get suffix that might have been used in _get_cache_key to
+        generate self.cache_key. Only used for informational purposes
+        in repo_edit.html.
+        """
+        # prefix, repo_name, suffix
+        return self._cache_key_partition()[2]
+
+    @classmethod
+    def delete_all_cache(cls):
+        """
+        Delete all cache keys from database.
+        Should only be run when all instances are down and all entries
+        thus stale.
+        """
+        cls.query().delete()
+        Session().commit()
+
+    @classmethod
+    def get_cache_key(cls, repo_name, cache_type):
+        """
+
+        Generate a cache key for this process of RhodeCode instance.
+        Prefix most likely will be process id or maybe explicitly set
+        instance_id from .ini file.
+        """
+        import rhodecode
+        prefix = safe_unicode(rhodecode.CONFIG.get('instance_id') or '')
+
+        repo_as_unicode = safe_unicode(repo_name)
+        key = u'{}_{}'.format(repo_as_unicode, cache_type) \
+            if cache_type else repo_as_unicode
+
+        return u'{}{}'.format(prefix, key)
+
+    @classmethod
+    def set_invalidate(cls, repo_name, delete=False):
+        """
+        Mark all caches of a repo as invalid in the database.
+        """
+
+        try:
+            qry = Session().query(cls).filter(cls.cache_args == repo_name)
+            if delete:
+                log.debug('cache objects deleted for repo %s',
+                          safe_str(repo_name))
+                qry.delete()
+            else:
+                log.debug('cache objects marked as invalid for repo %s',
+                          safe_str(repo_name))
+                qry.update({"cache_active": False})
+
+            Session().commit()
+        except Exception:
+            log.exception(
+                'Cache key invalidation failed for repository %s',
+                safe_str(repo_name))
+            Session().rollback()
+
+    @classmethod
+    def get_active_cache(cls, cache_key):
+        inv_obj = cls.query().filter(cls.cache_key == cache_key).scalar()
+        if inv_obj:
+            return inv_obj
+        return None
+
+    @classmethod
+    def repo_context_cache(cls, compute_func, repo_name, cache_type):
+        """
+        @cache_region('long_term')
+        def _heavy_calculation(cache_key):
+            return 'result'
+
+        cache_context = CacheKey.repo_context_cache(
+            _heavy_calculation, repo_name, cache_type)
+
+        with cache_context as context:
+            context.invalidate()
+            computed = context.compute()
+
+        assert computed == 'result'
+        """
+        from rhodecode.lib import caches
+        return caches.InvalidationContext(compute_func, repo_name, cache_type)
+
+
+class ChangesetComment(Base, BaseModel):
+    __tablename__ = 'changeset_comments'
+    __table_args__ = (
+        Index('cc_revision_idx', 'revision'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    COMMENT_OUTDATED = u'comment_outdated'
+
+    comment_id = Column('comment_id', Integer(), nullable=False, primary_key=True)
+    repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
+    revision = Column('revision', String(40), nullable=True)
+    pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
+    pull_request_version_id = Column("pull_request_version_id", Integer(), ForeignKey('pull_request_versions.pull_request_version_id'), nullable=True)
+    line_no = Column('line_no', Unicode(10), nullable=True)
+    hl_lines = Column('hl_lines', Unicode(512), nullable=True)
+    f_path = Column('f_path', Unicode(1000), nullable=True)
+    user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
+    text = Column('text', UnicodeText().with_variant(UnicodeText(25000), 'mysql'), nullable=False)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    renderer = Column('renderer', Unicode(64), nullable=True)
+    display_state = Column('display_state',  Unicode(128), nullable=True)
+
+    author = relationship('User', lazy='joined')
+    repo = relationship('Repository')
+    status_change = relationship('ChangesetStatus', cascade="all, delete, delete-orphan")
+    pull_request = relationship('PullRequest', lazy='joined')
+    pull_request_version = relationship('PullRequestVersion')
+
+    @classmethod
+    def get_users(cls, revision=None, pull_request_id=None):
+        """
+        Returns user associated with this ChangesetComment. ie those
+        who actually commented
+
+        :param cls:
+        :param revision:
+        """
+        q = Session().query(User)\
+                .join(ChangesetComment.author)
+        if revision:
+            q = q.filter(cls.revision == revision)
+        elif pull_request_id:
+            q = q.filter(cls.pull_request_id == pull_request_id)
+        return q.all()
+
+    def render(self, mentions=False):
+        from rhodecode.lib import helpers as h
+        return h.render(self.text, renderer=self.renderer, mentions=mentions)
+
+    def __repr__(self):
+        if self.comment_id:
+            return '<DB:ChangesetComment #%s>' % self.comment_id
+        else:
+            return '<DB:ChangesetComment at %#x>' % id(self)
+
+
+class ChangesetStatus(Base, BaseModel):
+    __tablename__ = 'changeset_statuses'
+    __table_args__ = (
+        Index('cs_revision_idx', 'revision'),
+        Index('cs_version_idx', 'version'),
+        UniqueConstraint('repo_id', 'revision', 'version'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed'
+    STATUS_APPROVED = 'approved'
+    STATUS_REJECTED = 'rejected'
+    STATUS_UNDER_REVIEW = 'under_review'
+
+    STATUSES = [
+        (STATUS_NOT_REVIEWED, _("Not Reviewed")),  # (no icon) and default
+        (STATUS_APPROVED, _("Approved")),
+        (STATUS_REJECTED, _("Rejected")),
+        (STATUS_UNDER_REVIEW, _("Under Review")),
+    ]
+
+    changeset_status_id = Column('changeset_status_id', Integer(), nullable=False, primary_key=True)
+    repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
+    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
+    revision = Column('revision', String(40), nullable=False)
+    status = Column('status', String(128), nullable=False, default=DEFAULT)
+    changeset_comment_id = Column('changeset_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'))
+    modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
+    version = Column('version', Integer(), nullable=False, default=0)
+    pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
+
+    author = relationship('User', lazy='joined')
+    repo = relationship('Repository')
+    comment = relationship('ChangesetComment', lazy='joined')
+    pull_request = relationship('PullRequest', lazy='joined')
+
+    def __unicode__(self):
+        return u"<%s('%s[%s]:%s')>" % (
+            self.__class__.__name__,
+            self.status, self.version, self.author
+        )
+
+    @classmethod
+    def get_status_lbl(cls, value):
+        return dict(cls.STATUSES).get(value)
+
+    @property
+    def status_lbl(self):
+        return ChangesetStatus.get_status_lbl(self.status)
+
+
+class _PullRequestBase(BaseModel):
+    """
+    Common attributes of pull request and version entries.
+    """
+
+    # .status values
+    STATUS_NEW = u'new'
+    STATUS_OPEN = u'open'
+    STATUS_CLOSED = u'closed'
+
+    title = Column('title', Unicode(255), nullable=True)
+    description = Column(
+        'description', UnicodeText().with_variant(UnicodeText(10240), 'mysql'),
+        nullable=True)
+    # new/open/closed status of pull request (not approve/reject/etc)
+    status = Column('status', Unicode(255), nullable=False, default=STATUS_NEW)
+    created_on = Column(
+        'created_on', DateTime(timezone=False), nullable=False,
+        default=datetime.datetime.now)
+    updated_on = Column(
+        'updated_on', DateTime(timezone=False), nullable=False,
+        default=datetime.datetime.now)
+
+    @declared_attr
+    def user_id(cls):
+        return Column(
+            "user_id", Integer(), ForeignKey('users.user_id'), nullable=False,
+            unique=None)
+
+    # 500 revisions max
+    _revisions = Column(
+        'revisions', UnicodeText().with_variant(UnicodeText(20500), 'mysql'))
+
+    @declared_attr
+    def source_repo_id(cls):
+        # TODO: dan: rename column to source_repo_id
+        return Column(
+            'org_repo_id', Integer(), ForeignKey('repositories.repo_id'),
+            nullable=False)
+
+    source_ref = Column('org_ref', Unicode(255), nullable=False)
+
+    @declared_attr
+    def target_repo_id(cls):
+        # TODO: dan: rename column to target_repo_id
+        return Column(
+            'other_repo_id', Integer(), ForeignKey('repositories.repo_id'),
+            nullable=False)
+
+    target_ref = Column('other_ref', Unicode(255), nullable=False)
+
+    # TODO: dan: rename column to last_merge_source_rev
+    _last_merge_source_rev = Column(
+        'last_merge_org_rev', String(40), nullable=True)
+    # TODO: dan: rename column to last_merge_target_rev
+    _last_merge_target_rev = Column(
+        'last_merge_other_rev', String(40), nullable=True)
+    _last_merge_status = Column('merge_status', Integer(), nullable=True)
+    merge_rev = Column('merge_rev', String(40), nullable=True)
+
+    @hybrid_property
+    def revisions(self):
+        return self._revisions.split(':') if self._revisions else []
+
+    @revisions.setter
+    def revisions(self, val):
+        self._revisions = ':'.join(val)
+
+    @declared_attr
+    def author(cls):
+        return relationship('User', lazy='joined')
+
+    @declared_attr
+    def source_repo(cls):
+        return relationship(
+            'Repository',
+            primaryjoin='%s.source_repo_id==Repository.repo_id' % cls.__name__)
+
+    @property
+    def source_ref_parts(self):
+        refs = self.source_ref.split(':')
+        return Reference(refs[0], refs[1], refs[2])
+
+    @declared_attr
+    def target_repo(cls):
+        return relationship(
+            'Repository',
+            primaryjoin='%s.target_repo_id==Repository.repo_id' % cls.__name__)
+
+    @property
+    def target_ref_parts(self):
+        refs = self.target_ref.split(':')
+        return Reference(refs[0], refs[1], refs[2])
+
+
+class PullRequest(Base, _PullRequestBase):
+    __tablename__ = 'pull_requests'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    pull_request_id = Column(
+        'pull_request_id', Integer(), nullable=False, primary_key=True)
+
+    def __repr__(self):
+        if self.pull_request_id:
+            return '<DB:PullRequest #%s>' % self.pull_request_id
+        else:
+            return '<DB:PullRequest at %#x>' % id(self)
+
+    reviewers = relationship('PullRequestReviewers',
+                             cascade="all, delete, delete-orphan")
+    statuses = relationship('ChangesetStatus')
+    comments = relationship('ChangesetComment',
+                            cascade="all, delete, delete-orphan")
+    versions = relationship('PullRequestVersion',
+                            cascade="all, delete, delete-orphan")
+
+    def is_closed(self):
+        return self.status == self.STATUS_CLOSED
+
+    def get_api_data(self):
+        from rhodecode.model.pull_request import PullRequestModel
+        pull_request = self
+        merge_status = PullRequestModel().merge_status(pull_request)
+        data = {
+            'pull_request_id': pull_request.pull_request_id,
+            'url': url('pullrequest_show', repo_name=self.target_repo.repo_name,
+                                       pull_request_id=self.pull_request_id,
+                                       qualified=True),
+            'title': pull_request.title,
+            'description': pull_request.description,
+            'status': pull_request.status,
+            'created_on': pull_request.created_on,
+            'updated_on': pull_request.updated_on,
+            'commit_ids': pull_request.revisions,
+            'review_status': pull_request.calculated_review_status(),
+            'mergeable': {
+                'status': merge_status[0],
+                'message': unicode(merge_status[1]),
+            },
+            'source': {
+                'clone_url': pull_request.source_repo.clone_url(),
+                'repository': pull_request.source_repo.repo_name,
+                'reference': {
+                    'name': pull_request.source_ref_parts.name,
+                    'type': pull_request.source_ref_parts.type,
+                    'commit_id': pull_request.source_ref_parts.commit_id,
+                },
+            },
+            'target': {
+                'clone_url': pull_request.target_repo.clone_url(),
+                'repository': pull_request.target_repo.repo_name,
+                'reference': {
+                    'name': pull_request.target_ref_parts.name,
+                    'type': pull_request.target_ref_parts.type,
+                    'commit_id': pull_request.target_ref_parts.commit_id,
+                },
+            },
+            'author': pull_request.author.get_api_data(include_secrets=False,
+                                                       details='basic'),
+            'reviewers': [
+                {
+                    'user': reviewer.get_api_data(include_secrets=False,
+                                                  details='basic'),
+                    'review_status': st[0][1].status if st else 'not_reviewed',
+                }
+                for reviewer, st in pull_request.reviewers_statuses()
+            ]
+        }
+
+        return data
+
+    def __json__(self):
+        return {
+            'revisions': self.revisions,
+        }
+
+    def calculated_review_status(self):
+        # TODO: anderson: 13.05.15 Used only on templates/my_account_pullrequests.html
+        # because it's tricky on how to use ChangesetStatusModel from there
+        warnings.warn("Use calculated_review_status from ChangesetStatusModel", DeprecationWarning)
+        from rhodecode.model.changeset_status import ChangesetStatusModel
+        return ChangesetStatusModel().calculated_review_status(self)
+
+    def reviewers_statuses(self):
+        warnings.warn("Use reviewers_statuses from ChangesetStatusModel", DeprecationWarning)
+        from rhodecode.model.changeset_status import ChangesetStatusModel
+        return ChangesetStatusModel().reviewers_statuses(self)
+
+
+class PullRequestVersion(Base, _PullRequestBase):
+    __tablename__ = 'pull_request_versions'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    pull_request_version_id = Column(
+        'pull_request_version_id', Integer(), nullable=False, primary_key=True)
+    pull_request_id = Column(
+        'pull_request_id', Integer(),
+        ForeignKey('pull_requests.pull_request_id'), nullable=False)
+    pull_request = relationship('PullRequest')
+
+    def __repr__(self):
+        if self.pull_request_version_id:
+            return '<DB:PullRequestVersion #%s>' % self.pull_request_version_id
+        else:
+            return '<DB:PullRequestVersion at %#x>' % id(self)
+
+
+class PullRequestReviewers(Base, BaseModel):
+    __tablename__ = 'pull_request_reviewers'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    def __init__(self, user=None, pull_request=None):
+        self.user = user
+        self.pull_request = pull_request
+
+    pull_requests_reviewers_id = Column(
+        'pull_requests_reviewers_id', Integer(), nullable=False,
+        primary_key=True)
+    pull_request_id = Column(
+        "pull_request_id", Integer(),
+        ForeignKey('pull_requests.pull_request_id'), nullable=False)
+    user_id = Column(
+        "user_id", Integer(), ForeignKey('users.user_id'), nullable=True)
+
+    user = relationship('User')
+    pull_request = relationship('PullRequest')
+
+
+class Notification(Base, BaseModel):
+    __tablename__ = 'notifications'
+    __table_args__ = (
+        Index('notification_type_idx', 'type'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+
+    TYPE_CHANGESET_COMMENT = u'cs_comment'
+    TYPE_MESSAGE = u'message'
+    TYPE_MENTION = u'mention'
+    TYPE_REGISTRATION = u'registration'
+    TYPE_PULL_REQUEST = u'pull_request'
+    TYPE_PULL_REQUEST_COMMENT = u'pull_request_comment'
+
+    notification_id = Column('notification_id', Integer(), nullable=False, primary_key=True)
+    subject = Column('subject', Unicode(512), nullable=True)
+    body = Column('body', UnicodeText().with_variant(UnicodeText(50000), 'mysql'), nullable=True)
+    created_by = Column("created_by", Integer(), ForeignKey('users.user_id'), nullable=True)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    type_ = Column('type', Unicode(255))
+
+    created_by_user = relationship('User')
+    notifications_to_users = relationship('UserNotification', lazy='joined',
+                                          cascade="all, delete, delete-orphan")
+
+    @property
+    def recipients(self):
+        return [x.user for x in UserNotification.query()\
+                .filter(UserNotification.notification == self)\
+                .order_by(UserNotification.user_id.asc()).all()]
+
+    @classmethod
+    def create(cls, created_by, subject, body, recipients, type_=None):
+        if type_ is None:
+            type_ = Notification.TYPE_MESSAGE
+
+        notification = cls()
+        notification.created_by_user = created_by
+        notification.subject = subject
+        notification.body = body
+        notification.type_ = type_
+        notification.created_on = datetime.datetime.now()
+
+        for u in recipients:
+            assoc = UserNotification()
+            assoc.notification = notification
+
+            # if created_by is inside recipients mark his notification
+            # as read
+            if u.user_id == created_by.user_id:
+                assoc.read = True
+
+            u.notifications.append(assoc)
+        Session().add(notification)
+
+        return notification
+
+    @property
+    def description(self):
+        from rhodecode.model.notification import NotificationModel
+        return NotificationModel().make_description(self)
+
+
+class UserNotification(Base, BaseModel):
+    __tablename__ = 'user_to_notification'
+    __table_args__ = (
+        UniqueConstraint('user_id', 'notification_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
+    notification_id = Column("notification_id", Integer(), ForeignKey('notifications.notification_id'), primary_key=True)
+    read = Column('read', Boolean, default=False)
+    sent_on = Column('sent_on', DateTime(timezone=False), nullable=True, unique=None)
+
+    user = relationship('User', lazy="joined")
+    notification = relationship('Notification', lazy="joined",
+                                order_by=lambda: Notification.created_on.desc(),)
+
+    def mark_as_read(self):
+        self.read = True
+        Session().add(self)
+
+
+class Gist(Base, BaseModel):
+    __tablename__ = 'gists'
+    __table_args__ = (
+        Index('g_gist_access_id_idx', 'gist_access_id'),
+        Index('g_created_on_idx', 'created_on'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+    GIST_PUBLIC = u'public'
+    GIST_PRIVATE = u'private'
+    DEFAULT_FILENAME = u'gistfile1.txt'
+
+    ACL_LEVEL_PUBLIC = u'acl_public'
+    ACL_LEVEL_PRIVATE = u'acl_private'
+
+    gist_id = Column('gist_id', Integer(), primary_key=True)
+    gist_access_id = Column('gist_access_id', Unicode(250))
+    gist_description = Column('gist_description', UnicodeText().with_variant(UnicodeText(1024), 'mysql'))
+    gist_owner = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=True)
+    gist_expires = Column('gist_expires', Float(53), nullable=False)
+    gist_type = Column('gist_type', Unicode(128), nullable=False)
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    acl_level = Column('acl_level', Unicode(128), nullable=True)
+
+    owner = relationship('User')
+
+    def __repr__(self):
+        return '<Gist:[%s]%s>' % (self.gist_type, self.gist_access_id)
+
+    @classmethod
+    def get_or_404(cls, id_):
+        res = cls.query().filter(cls.gist_access_id == id_).scalar()
+        if not res:
+            raise HTTPNotFound
+        return res
+
+    @classmethod
+    def get_by_access_id(cls, gist_access_id):
+        return cls.query().filter(cls.gist_access_id == gist_access_id).scalar()
+
+    def gist_url(self):
+        import rhodecode
+        alias_url = rhodecode.CONFIG.get('gist_alias_url')
+        if alias_url:
+            return alias_url.replace('{gistid}', self.gist_access_id)
+
+        return url('gist', gist_id=self.gist_access_id, qualified=True)
+
+    @classmethod
+    def base_path(cls):
+        """
+        Returns base path when all gists are stored
+
+        :param cls:
+        """
+        from rhodecode.model.gist import GIST_STORE_LOC
+        q = Session().query(RhodeCodeUi)\
+            .filter(RhodeCodeUi.ui_key == URL_SEP)
+        q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
+        return os.path.join(q.one().ui_value, GIST_STORE_LOC)
+
+    def get_api_data(self):
+        """
+        Common function for generating gist related data for API
+        """
+        gist = self
+        data = {
+            'gist_id': gist.gist_id,
+            'type': gist.gist_type,
+            'access_id': gist.gist_access_id,
+            'description': gist.gist_description,
+            'url': gist.gist_url(),
+            'expires': gist.gist_expires,
+            'created_on': gist.created_on,
+            'modified_at': gist.modified_at,
+            'content': None,
+            'acl_level': gist.acl_level,
+        }
+        return data
+
+    def __json__(self):
+        data = dict(
+        )
+        data.update(self.get_api_data())
+        return data
+    # SCM functions
+
+    def scm_instance(self, **kwargs):
+        from rhodecode.lib.vcs import get_repo
+        base_path = self.base_path()
+        return get_repo(os.path.join(*map(safe_str,
+                                          [base_path, self.gist_access_id])))
+
+
+class DbMigrateVersion(Base, BaseModel):
+    __tablename__ = 'db_migrate_version'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
+    repository_id = Column('repository_id', String(250), primary_key=True)
+    repository_path = Column('repository_path', Text)
+    version = Column('version', Integer)
+
+
+class ExternalIdentity(Base, BaseModel):
+    __tablename__ = 'external_identities'
+    __table_args__ = (
+        Index('local_user_id_idx', 'local_user_id'),
+        Index('external_id_idx', 'external_id'),
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8'})
+
+    external_id = Column('external_id', Unicode(255), default=u'',
+                         primary_key=True)
+    external_username = Column('external_username', Unicode(1024), default=u'')
+    local_user_id = Column('local_user_id', Integer(),
+                           ForeignKey('users.user_id'), primary_key=True)
+    provider_name = Column('provider_name', Unicode(255), default=u'',
+                           primary_key=True)
+    access_token = Column('access_token', String(1024), default=u'')
+    alt_token = Column('alt_token', String(1024), default=u'')
+    token_secret = Column('token_secret', String(1024), default=u'')
+
+    @classmethod
+    def by_external_id_and_provider(cls, external_id, provider_name,
+                                    local_user_id=None):
+        """
+        Returns ExternalIdentity instance based on search params
+
+        :param external_id:
+        :param provider_name:
+        :return: ExternalIdentity
+        """
+        query = cls.query()
+        query = query.filter(cls.external_id == external_id)
+        query = query.filter(cls.provider_name == provider_name)
+        if local_user_id:
+            query = query.filter(cls.local_user_id == local_user_id)
+        return query.first()
+
+    @classmethod
+    def user_by_external_id_and_provider(cls, external_id, provider_name):
+        """
+        Returns User instance based on search params
+
+        :param external_id:
+        :param provider_name:
+        :return: User
+        """
+        query = User.query()
+        query = query.filter(cls.external_id == external_id)
+        query = query.filter(cls.provider_name == provider_name)
+        query = query.filter(User.user_id == cls.local_user_id)
+        return query.first()
+
+    @classmethod
+    def by_local_user_id(cls, local_user_id):
+        """
+        Returns all tokens for user
+
+        :param local_user_id:
+        :return: ExternalIdentity
+        """
+        query = cls.query()
+        query = query.filter(cls.local_user_id == local_user_id)
+        return query
+
+
+class Integration(Base, BaseModel):
+    __tablename__ = 'integrations'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    integration_id = Column('integration_id', Integer(), primary_key=True)
+    integration_type = Column('integration_type', String(255))
+    enabled = Column("enabled", Boolean(), nullable=False)
+    name = Column('name', String(255), nullable=False)
+    settings_json = Column('settings_json',
+        UnicodeText().with_variant(UnicodeText(16384), 'mysql'))
+    repo_id = Column(
+        "repo_id", Integer(), ForeignKey('repositories.repo_id'),
+        nullable=True, unique=None, default=None)
+    repo = relationship('Repository', lazy='joined')
+
+    @hybrid_property
+    def settings(self):
+        data = json.loads(self.settings_json or '{}')
+        return data
+
+    @settings.setter
+    def settings(self, dct):
+        self.settings_json = json.dumps(dct, indent=2)
+
+    def __repr__(self):
+        if self.repo:
+            scope = 'repo=%r' % self.repo
+        else:
+            scope = 'global'
+
+        return '<Integration(%r, %r)>' % (self.integration_type, scope)
+
+    def settings_as_dict(self):
+        return json.loads(self.settings_json)

rhodecode/lib/dbmigrate/versions/055_version_4_3_0.py

@@ -0,0 +1,27 b''
+# -*- coding: utf-8 -*-
+
+import logging
+import sqlalchemy as sa
+
+from alembic.migration import MigrationContext
+from alembic.operations import Operations
+
+from rhodecode.lib.dbmigrate.versions import _reset_base
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_3_0_0
+
+    integrations_table = db_4_3_0_0.Integration.__table__
+    integrations_table.create()
+
+
+def downgrade(migrate_engine):
+    pass

rhodecode/lib/jsonalchemy.py

@@ -0,0 +1,265 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import collections
+
+import sqlalchemy
+from sqlalchemy import UnicodeText
+from sqlalchemy.ext.mutable import Mutable
+
+from rhodecode.lib.ext_json import json
+
+
+class JsonRaw(unicode):
+    """
+    Allows interacting with a JSON types field using a raw string.
+
+    For example::
+        db_instance = JsonTable()
+        db_instance.enabled = True
+        db_instance.json_data = JsonRaw('{"a": 4}')
+
+    This will bypass serialization/checks, and allow storing
+    raw values
+    """
+    pass
+
+
+# Set this to the standard dict if Order is not required
+DictClass = collections.OrderedDict
+
+
+class JSONEncodedObj(sqlalchemy.types.TypeDecorator):
+    """
+    Represents an immutable structure as a json-encoded string.
+
+    If default is, for example, a dict, then a NULL value in the
+    database will be exposed as an empty dict.
+    """
+
+    impl = UnicodeText
+    safe = True
+
+    def __init__(self, *args, **kwargs):
+        self.default = kwargs.pop('default', None)
+        self.safe = kwargs.pop('safe_json', self.safe)
+        self.dialect_map = kwargs.pop('dialect_map', {})
+        super(JSONEncodedObj, self).__init__(*args, **kwargs)
+
+    def load_dialect_impl(self, dialect):
+        if dialect.name in self.dialect_map:
+            return dialect.type_descriptor(self.dialect_map[dialect.name])
+        return dialect.type_descriptor(self.impl)
+
+    def process_bind_param(self, value, dialect):
+        if isinstance(value, JsonRaw):
+            value = value
+        elif value is not None:
+            value = json.dumps(value)
+        return value
+
+    def process_result_value(self, value, dialect):
+        if self.default is not None and (not value or value == '""'):
+            return self.default()
+
+        if value is not None:
+            try:
+                value = json.loads(value, object_pairs_hook=DictClass)
+            except Exception as e:
+                if self.safe:
+                    return self.default()
+                else:
+                    raise
+        return value
+
+
+class MutationObj(Mutable):
+    @classmethod
+    def coerce(cls, key, value):
+        if isinstance(value, dict) and not isinstance(value, MutationDict):
+            return MutationDict.coerce(key, value)
+        if isinstance(value, list) and not isinstance(value, MutationList):
+            return MutationList.coerce(key, value)
+        return value
+
+    @classmethod
+    def _listen_on_attribute(cls, attribute, coerce, parent_cls):
+        key = attribute.key
+        if parent_cls is not attribute.class_:
+            return
+
+        # rely on "propagate" here
+        parent_cls = attribute.class_
+
+        def load(state, *args):
+            val = state.dict.get(key, None)
+            if coerce:
+                val = cls.coerce(key, val)
+                state.dict[key] = val
+            if isinstance(val, cls):
+                val._parents[state.obj()] = key
+
+        def set(target, value, oldvalue, initiator):
+            if not isinstance(value, cls):
+                value = cls.coerce(key, value)
+            if isinstance(value, cls):
+                value._parents[target.obj()] = key
+            if isinstance(oldvalue, cls):
+                oldvalue._parents.pop(target.obj(), None)
+            return value
+
+        def pickle(state, state_dict):
+            val = state.dict.get(key, None)
+            if isinstance(val, cls):
+                if 'ext.mutable.values' not in state_dict:
+                    state_dict['ext.mutable.values'] = []
+                state_dict['ext.mutable.values'].append(val)
+
+        def unpickle(state, state_dict):
+            if 'ext.mutable.values' in state_dict:
+                for val in state_dict['ext.mutable.values']:
+                    val._parents[state.obj()] = key
+
+        sqlalchemy.event.listen(parent_cls, 'load', load, raw=True,
+                                propagate=True)
+        sqlalchemy.event.listen(parent_cls, 'refresh', load, raw=True,
+                                propagate=True)
+        sqlalchemy.event.listen(parent_cls, 'pickle', pickle, raw=True,
+                                propagate=True)
+        sqlalchemy.event.listen(attribute, 'set', set, raw=True, retval=True,
+                                propagate=True)
+        sqlalchemy.event.listen(parent_cls, 'unpickle', unpickle, raw=True,
+                                propagate=True)
+
+
+class MutationDict(MutationObj, DictClass):
+    @classmethod
+    def coerce(cls, key, value):
+        """Convert plain dictionary to MutationDict"""
+        self = MutationDict(
+            (k, MutationObj.coerce(key, v)) for (k, v) in value.items())
+        self._key = key
+        return self
+
+    def __setitem__(self, key, value):
+        # Due to the way OrderedDict works, this is called during __init__.
+        # At this time we don't have a key set, but what is more, the value
+        # being set has already been coerced. So special case this and skip.
+        if hasattr(self, '_key'):
+            value = MutationObj.coerce(self._key, value)
+        DictClass.__setitem__(self, key, value)
+        self.changed()
+
+    def __delitem__(self, key):
+        DictClass.__delitem__(self, key)
+        self.changed()
+
+    def __setstate__(self, state):
+        self.__dict__ = state
+
+    def __reduce_ex__(self, proto):
+        # support pickling of MutationDicts
+        d = dict(self)
+        return (self.__class__, (d, ))
+
+
+class MutationList(MutationObj, list):
+    @classmethod
+    def coerce(cls, key, value):
+        """Convert plain list to MutationList"""
+        self = MutationList((MutationObj.coerce(key, v) for v in value))
+        self._key = key
+        return self
+
+    def __setitem__(self, idx, value):
+        list.__setitem__(self, idx, MutationObj.coerce(self._key, value))
+        self.changed()
+
+    def __setslice__(self, start, stop, values):
+        list.__setslice__(self, start, stop,
+                          (MutationObj.coerce(self._key, v) for v in values))
+        self.changed()
+
+    def __delitem__(self, idx):
+        list.__delitem__(self, idx)
+        self.changed()
+
+    def __delslice__(self, start, stop):
+        list.__delslice__(self, start, stop)
+        self.changed()
+
+    def append(self, value):
+        list.append(self, MutationObj.coerce(self._key, value))
+        self.changed()
+
+    def insert(self, idx, value):
+        list.insert(self, idx, MutationObj.coerce(self._key, value))
+        self.changed()
+
+    def extend(self, values):
+        list.extend(self, (MutationObj.coerce(self._key, v) for v in values))
+        self.changed()
+
+    def pop(self, *args, **kw):
+        value = list.pop(self, *args, **kw)
+        self.changed()
+        return value
+
+    def remove(self, value):
+        list.remove(self, value)
+        self.changed()
+
+
+def JsonType(impl=None, **kwargs):
+    """
+    Helper for using a mutation obj, it allows to use .with_variant easily.
+    example::
+
+        settings = Column('settings_json',
+            MutationObj.as_mutable(
+            JsonType(dialect_map=dict(mysql=UnicodeText(16384))))
+    """
+
+    if impl == 'list':
+        return JSONEncodedObj(default=list, **kwargs)
+    elif impl == 'dict':
+        return JSONEncodedObj(default=DictClass, **kwargs)
+    else:
+        return JSONEncodedObj(**kwargs)
+
+
+JSON = MutationObj.as_mutable(JsonType())
+"""
+A type to encode/decode JSON on the fly
+
+sqltype is the string type for the underlying DB column::
+
+    Column(JSON) (defaults to UnicodeText)
+"""
+
+JSONDict = MutationObj.as_mutable(JsonType('dict'))
+"""
+A type to encode/decode JSON dictionaries on the fly
+"""
+
+JSONList = MutationObj.as_mutable(JsonType('list'))
+"""
+A type to encode/decode JSON lists` on the fly
+"""

rhodecode/lib/vcs/geventcurl.py

@@ -0,0 +1,245 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+"""
+This serves as a drop in replacement for pycurl. It implements the pycurl Curl
+class in a way that is compatible with gevent.
+"""
+
+
+import logging
+import gevent
+import pycurl
+
+# Import everything from pycurl.
+# This allows us to use this module as a drop in replacement of pycurl.
+from pycurl import *  # noqa
+
+from gevent import core
+from gevent.hub import Waiter
+
+
+log = logging.getLogger(__name__)
+
+
+class GeventCurlMulti(object):
+    """
+    Wrapper around pycurl.CurlMulti that integrates it into gevent's event
+    loop.
+
+    Parts of this class are a modified version of code copied from the Tornado
+    Web Server project which is licensed under the Apache License, Version 2.0
+    (the "License"). To be more specific the code originates from this file:
+    https://github.com/tornadoweb/tornado/blob/stable/tornado/curl_httpclient.py
+
+    This is the original license header of the origin:
+
+        Copyright 2009 Facebook
+
+        Licensed under the Apache License, Version 2.0 (the "License"); you may
+        not use this file except in compliance with the License. You may obtain
+        a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+        implied. See the License for the specific language governing
+        permissions and limitations under the License.
+    """
+
+    def __init__(self, loop=None):
+        self._watchers = {}
+        self._timeout = None
+        self.loop = loop or gevent.get_hub().loop
+
+        # Setup curl's multi instance.
+        self._curl_multi = pycurl.CurlMulti()
+        self.setopt(pycurl.M_TIMERFUNCTION, self._set_timeout)
+        self.setopt(pycurl.M_SOCKETFUNCTION, self._handle_socket)
+
+    def __getattr__(self, item):
+        """
+        The pycurl.CurlMulti class is final and we cannot subclass it.
+        Therefore we are wrapping it and forward everything to it here.
+        """
+        return getattr(self._curl_multi, item)
+
+    def add_handle(self, curl):
+        """
+        Add handle variant that also takes care about the initial invocation of
+        socket action method. This is done by setting an immediate timeout.
+        """
+        result = self._curl_multi.add_handle(curl)
+        self._set_timeout(0)
+        return result
+
+    def _handle_socket(self, event, fd, multi, data):
+        """
+        Called by libcurl when it wants to change the file descriptors it cares
+        about.
+        """
+        event_map = {
+            pycurl.POLL_NONE: core.NONE,
+            pycurl.POLL_IN: core.READ,
+            pycurl.POLL_OUT: core.WRITE,
+            pycurl.POLL_INOUT: core.READ | core.WRITE
+        }
+
+        if event == pycurl.POLL_REMOVE:
+            watcher = self._watchers.pop(fd, None)
+            if watcher is not None:
+                watcher.stop()
+        else:
+            gloop_event = event_map[event]
+            watcher = self._watchers.get(fd)
+            if watcher is None:
+                watcher = self.loop.io(fd, gloop_event)
+                watcher.start(self._handle_events, fd, pass_events=True)
+                self._watchers[fd] = watcher
+            else:
+                if watcher.events != gloop_event:
+                    watcher.stop()
+                    watcher.events = gloop_event
+                    watcher.start(self._handle_events, fd, pass_events=True)
+
+    def _set_timeout(self, msecs):
+        """
+        Called by libcurl to schedule a timeout.
+        """
+        if self._timeout is not None:
+            self._timeout.stop()
+        self._timeout = self.loop.timer(msecs/1000.0)
+        self._timeout.start(self._handle_timeout)
+
+    def _handle_events(self, events, fd):
+        action = 0
+        if events & core.READ:
+            action |= pycurl.CSELECT_IN
+        if events & core.WRITE:
+            action |= pycurl.CSELECT_OUT
+        while True:
+            try:
+                ret, num_handles = self._curl_multi.socket_action(fd, action)
+            except pycurl.error, e:
+                ret = e.args[0]
+            if ret != pycurl.E_CALL_MULTI_PERFORM:
+                break
+        self._finish_pending_requests()
+
+    def _handle_timeout(self):
+        """
+        Called by IOLoop when the requested timeout has passed.
+        """
+        if self._timeout is not None:
+            self._timeout.stop()
+            self._timeout = None
+        while True:
+            try:
+                ret, num_handles = self._curl_multi.socket_action(
+                    pycurl.SOCKET_TIMEOUT, 0)
+            except pycurl.error, e:
+                ret = e.args[0]
+            if ret != pycurl.E_CALL_MULTI_PERFORM:
+                break
+        self._finish_pending_requests()
+
+        # In theory, we shouldn't have to do this because curl will call
+        # _set_timeout whenever the timeout changes. However, sometimes after
+        # _handle_timeout we will need to reschedule immediately even though
+        # nothing has changed from curl's perspective. This is because when
+        # socket_action is called with SOCKET_TIMEOUT, libcurl decides
+        # internally which timeouts need to be processed by using a monotonic
+        # clock (where available) while tornado uses python's time.time() to
+        # decide when timeouts have occurred. When those clocks disagree on
+        # elapsed time (as they will whenever there is an NTP adjustment),
+        # tornado might call _handle_timeout before libcurl is ready. After
+        # each timeout, resync the scheduled timeout with libcurl's current
+        # state.
+        new_timeout = self._curl_multi.timeout()
+        if new_timeout >= 0:
+            self._set_timeout(new_timeout)
+
+    def _finish_pending_requests(self):
+        """
+        Process any requests that were completed by the last call to
+        multi.socket_action.
+        """
+        while True:
+            num_q, ok_list, err_list = self._curl_multi.info_read()
+            for curl in ok_list:
+                curl.waiter.switch()
+            for curl, errnum, errmsg in err_list:
+                curl.waiter.throw(Exception('%s %s' % (errnum, errmsg)))
+            if num_q == 0:
+                break
+
+
+class GeventCurl(object):
+    """
+    Gevent compatible implementation of the pycurl.Curl class. Essentially a
+    wrapper around pycurl.Curl with a customized perform method. It uses the
+    GeventCurlMulti class to implement a blocking API to libcurl's "easy"
+    interface.
+    """
+
+    # Reference to the GeventCurlMulti instance.
+    _multi_instance = None
+
+    def __init__(self):
+        self._curl = pycurl.Curl()
+
+    def __getattr__(self, item):
+        """
+        The pycurl.Curl class is final and we cannot subclass it. Therefore we
+        are wrapping it and forward everything to it here.
+        """
+        return getattr(self._curl, item)
+
+    @property
+    def _multi(self):
+        """
+        Lazy property that returns the GeventCurlMulti instance. The value is
+        cached as a class attribute. Therefore only one instance per process
+        exists.
+        """
+        if GeventCurl._multi_instance is None:
+            GeventCurl._multi_instance = GeventCurlMulti()
+        return GeventCurl._multi_instance
+
+    def perform(self):
+        """
+        This perform method is compatible with gevent because it uses gevent
+        synchronization mechanisms to wait for the request to finish.
+        """
+        waiter = self._curl.waiter = Waiter()
+        try:
+            self._multi.add_handle(self._curl)
+            response = waiter.get()
+        finally:
+            self._multi.remove_handle(self._curl)
+            del self._curl.waiter
+
+        return response
+
+# Curl is originally imported from pycurl. At this point we override it with
+# our custom implementation.
+Curl = GeventCurl

rhodecode/model/integration.py

@@ -0,0 +1,132 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+"""
+Model for integrations
+"""
+
+
+import logging
+import traceback
+
+from pylons import tmpl_context as c
+from pylons.i18n.translation import _, ungettext
+from sqlalchemy import or_
+from sqlalchemy.sql.expression import false, true
+from mako import exceptions
+
+import rhodecode
+from rhodecode import events
+from rhodecode.lib import helpers as h
+from rhodecode.lib.caching_query import FromCache
+from rhodecode.lib.utils import PartialRenderer
+from rhodecode.model import BaseModel
+from rhodecode.model.db import Integration, User
+from rhodecode.model.meta import Session
+from rhodecode.integrations import integration_type_registry
+from rhodecode.integrations.types.base import IntegrationTypeBase
+
+log = logging.getLogger(__name__)
+
+
+class IntegrationModel(BaseModel):
+
+    cls = Integration
+
+    def __get_integration(self, integration):
+        if isinstance(integration, Integration):
+            return integration
+        elif isinstance(integration, (int, long)):
+            return self.sa.query(Integration).get(integration)
+        else:
+            if integration:
+                raise Exception('integration must be int, long or Instance'
+                                ' of Integration got %s' % type(integration))
+
+    def create(self, IntegrationType, enabled, name, settings, repo=None):
+        """ Create an IntegrationType integration """
+        integration = Integration()
+        integration.integration_type = IntegrationType.key
+        integration.settings = {}
+        integration.repo = repo
+        integration.enabled = enabled
+        integration.name = name
+
+        self.sa.add(integration)
+        self.sa.commit()
+        return integration
+
+    def delete(self, integration):
+        try:
+            integration = self.__get_integration(integration)
+            if integration:
+                self.sa.delete(integration)
+                return True
+        except Exception:
+            log.error(traceback.format_exc())
+            raise
+        return False
+
+    def get_integration_handler(self, integration):
+        TypeClass = integration_type_registry.get(integration.integration_type)
+        if not TypeClass:
+            log.error('No class could be found for integration type: {}'.format(
+                integration.integration_type))
+            return None
+
+        return TypeClass(integration.settings)
+
+    def send_event(self, integration, event):
+        """ Send an event to an integration """
+        handler = self.get_integration_handler(integration)
+        if handler:
+            handler.send_event(event)
+
+    def get_integrations(self, repo=None):
+        if repo:
+            return self.sa.query(Integration).filter(
+                Integration.repo_id==repo.repo_id).all()
+
+        # global integrations
+        return self.sa.query(Integration).filter(
+            Integration.repo_id==None).all()
+
+    def get_for_event(self, event, cache=False):
+        """
+        Get integrations that match an event
+        """
+        query = self.sa.query(Integration).filter(Integration.enabled==True)
+
+        if isinstance(event, events.RepoEvent): # global + repo integrations
+            query = query.filter(
+                        or_(Integration.repo_id==None,
+                            Integration.repo_id==event.repo.repo_id))
+            if cache:
+                query = query.options(FromCache(
+                    "sql_cache_short",
+                    "get_enabled_repo_integrations_%i" % event.repo.repo_id))
+        else: # only global integrations
+            query = query.filter(Integration.repo_id==None)
+            if cache:
+                query = query.options(FromCache(
+                    "sql_cache_short", "get_enabled_global_integrations"))
+
+        return query.all()

rhodecode/model/validation_schema/__init__.py

@@ -0,0 +1,24 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import colander
+
+from colander import Invalid  # noqa, don't remove this
+

rhodecode/model/validation_schema/preparers.py

@@ -0,0 +1,89 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import unicodedata
+
+
+
+def strip_preparer(value):
+    """
+    strips given values using .strip() function
+    """
+
+    if value:
+        value = value.strip()
+    return value
+
+
+def slugify_preparer(value):
+    """
+    Slugify given value to a safe representation for url/id
+    """
+    from rhodecode.lib.utils import repo_name_slug
+    if value:
+        value = repo_name_slug(value.lower())
+    return value
+
+
+def non_ascii_strip_preparer(value):
+    """
+    trie to replace non-ascii letters to their ascii representation
+    eg::
+
+        `żołw` converts into `zolw`
+    """
+    if value:
+        value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')
+    return value
+
+
+def unique_list_preparer(value):
+    """
+    Converts an list to a list with only unique values
+    """
+
+    def make_unique(value):
+        seen = []
+        return [c for c in value if
+                not (c in seen or seen.append(c))]
+
+    if isinstance(value, list):
+        ret_val = make_unique(value)
+    elif isinstance(value, set):
+        ret_val = list(value)
+    elif isinstance(value, tuple):
+        ret_val = make_unique(value)
+    elif value is None:
+        ret_val = []
+    else:
+        ret_val = [value]
+
+    return ret_val
+
+
+def unique_list_from_str_preparer(value):
+    """
+    Converts an list to a list with only unique values
+    """
+    from rhodecode.lib.utils2 import aslist
+
+    if isinstance(value, basestring):
+        value = aslist(value, ',')
+    return unique_list_preparer(value)
  No newline at end of file

rhodecode/model/validation_schema/schemas/__init__.py

@@ -0,0 +1,25 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+"""
+Colander Schema nodes
+http://docs.pylonsproject.org/projects/colander/en/latest/basics.html#schema-node-objects
+"""
+

rhodecode/model/validation_schema/schemas/gist_schema.py

@@ -0,0 +1,185 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import os
+
+import colander
+
+from rhodecode.translation import _
+from rhodecode.model.validation_schema import validators, preparers
+
+
+def nodes_to_sequence(nodes, colander_node=None):
+    """
+    Converts old style dict nodes to new list of dicts
+
+    :param nodes: dict with key beeing name of the file
+
+    """
+    if not isinstance(nodes, dict):
+        msg = 'Nodes needs to be a dict, got {}'.format(type(nodes))
+        raise colander.Invalid(colander_node, msg)
+    out = []
+
+    for key, val in nodes.items():
+        val = (isinstance(val, dict) and val) or {}
+        out.append(dict(
+            filename=key,
+            content=val.get('content'),
+            mimetype=val.get('mimetype')
+        ))
+
+    out = Nodes().deserialize(out)
+    return out
+
+
+def sequence_to_nodes(nodes, colander_node=None):
+    if not isinstance(nodes, list):
+        msg = 'Nodes needs to be a list, got {}'.format(type(nodes))
+        raise colander.Invalid(colander_node, msg)
+    nodes = Nodes().deserialize(nodes)
+
+    out = {}
+    try:
+        for file_data in nodes:
+            file_data_skip = file_data.copy()
+            # if we got filename_org we use it as a key so we keep old
+            # name as input and rename is-reflected inside the values as
+            # filename and filename_org differences.
+            filename_org = file_data.get('filename_org')
+            filename = filename_org or file_data['filename']
+            out[filename] = {}
+            out[filename].update(file_data_skip)
+
+    except Exception as e:
+        msg = 'Invalid data format org_exc:`{}`'.format(repr(e))
+        raise colander.Invalid(colander_node, msg)
+    return out
+
+
[e-mail]
+def deferred_lifetime_validator(node, kw):
+    options = kw.get('lifetime_options', [])
+    return colander.All(
+        colander.Range(min=-1, max=60 * 24 * 30 * 12),
+        colander.OneOf([x for x in options]))
+
+
+def unique_gist_validator(node, value):
+    from rhodecode.model.db import Gist
+    existing = Gist.get_by_access_id(value)
+    if existing:
+        msg = _(u'Gist with name {} already exists').format(value)
+        raise colander.Invalid(node, msg)
+
+
+def filename_validator(node, value):
+    if value != os.path.basename(value):
+        msg = _(u'Filename {} cannot be inside a directory').format(value)
+        raise colander.Invalid(node, msg)
+
+
+class NodeSchema(colander.MappingSchema):
+    # if we perform rename this will be org filename
+    filename_org = colander.SchemaNode(
+        colander.String(),
+        preparer=[preparers.strip_preparer,
+                  preparers.non_ascii_strip_preparer],
+        validator=filename_validator,
+        missing=None)
+
+    filename = colander.SchemaNode(
+        colander.String(),
+        preparer=[preparers.strip_preparer,
+                  preparers.non_ascii_strip_preparer],
+        validator=filename_validator)
+
+    content = colander.SchemaNode(
+        colander.String())
+    mimetype = colander.SchemaNode(
+        colander.String(),
+        missing=None)
+
+
+class Nodes(colander.SequenceSchema):
+    filenames = NodeSchema()
+
+    def validator(self, node, cstruct):
+        if not isinstance(cstruct, list):
+            return
+
+        found_filenames = []
+        for data in cstruct:
+            filename = data['filename']
+            if filename in found_filenames:
+                msg = _('Duplicated value for filename found: `{}`').format(
+                    filename)
+                raise colander.Invalid(node, msg)
+            found_filenames.append(filename)
+
+
+class GistSchema(colander.MappingSchema):
+    """
+    schema = GistSchema()
+    schema.bind(
+        lifetime_options = [1,2,3]
+    )
+    out = schema.deserialize(dict(
+        nodes=[
+            {'filename': 'x', 'content': 'xxx', },
+            {'filename': 'docs/Z', 'content': 'xxx', 'mimetype': 'x'},
+        ]
+    ))
+    """
+
+    from rhodecode.model.db import Gist
+
+    gistid = colander.SchemaNode(
+        colander.String(),
+        missing=None,
+        preparer=[preparers.strip_preparer,
+                  preparers.non_ascii_strip_preparer,
+                  preparers.slugify_preparer],
+        validator=colander.All(
+            colander.Length(min=3),
+            unique_gist_validator
+        ))
+
+    description = colander.SchemaNode(
+        colander.String(),
+        missing=u'')
+
+    lifetime = colander.SchemaNode(
+        colander.Integer(),
+        validator=deferred_lifetime_validator)
+
+    gist_acl_level = colander.SchemaNode(
+        colander.String(),
+        validator=colander.OneOf([Gist.ACL_LEVEL_PUBLIC,
+                                  Gist.ACL_LEVEL_PRIVATE]))
+
+    gist_type = colander.SchemaNode(
+        colander.String(),
+        missing=Gist.ACL_LEVEL_PUBLIC,
+        validator=colander.OneOf([Gist.GIST_PRIVATE, Gist.GIST_PUBLIC]))
+
+    nodes = Nodes()
+
+

rhodecode/model/validation_schema/schemas/repo_group_schema.py

@@ -0,0 +1,29 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+import colander
+
+
+from rhodecode.model.validation_schema import validators, preparers, types
+
+
+class RepoGroupSchema(colander.Schema):
+    group_name = colander.SchemaNode(types.GroupNameType())

rhodecode/model/validation_schema/schemas/repo_schema.py

@@ -0,0 +1,27 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import colander
+
+from rhodecode.model.validation_schema import validators, preparers, types
+
+
+class RepoSchema(colander.Schema):
+    repo_name = colander.SchemaNode(types.GroupNameType())

rhodecode/model/validation_schema/schemas/search_schema.py

@@ -0,0 +1,44 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+import colander
+
+
+class SearchParamsSchema(colander.MappingSchema):
+    search_query = colander.SchemaNode(
+        colander.String(),
+        missing='')
+    search_type = colander.SchemaNode(
+        colander.String(),
+        missing='content',
+        validator=colander.OneOf(['content', 'path', 'commit', 'repository']))
+    search_sort = colander.SchemaNode(
+        colander.String(),
+        missing='newfirst',
+        validator=colander.OneOf(
+            ['oldfirst', 'newfirst']))
+    page_limit = colander.SchemaNode(
+        colander.Integer(),
+        missing=10,
+        validator=colander.Range(1, 500))
+    requested_page = colander.SchemaNode(
+        colander.Integer(),
+        missing=1)

rhodecode/model/validation_schema/types.py

@@ -0,0 +1,34 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import colander
+
+
+class GroupNameType(colander.String):
+    SEPARATOR = '/'
+
+    def deserialize(self, node, cstruct):
+        result = super(GroupNameType, self).deserialize(node, cstruct)
+        return self._replace_extra_slashes(result)
+
+    def _replace_extra_slashes(self, path):
+        path = path.split(self.SEPARATOR)
+        path = [item for item in path if item]
+        return self.SEPARATOR.join(path)

rhodecode/model/validation_schema/validators.py

@@ -0,0 +1,19 b''
+import os
+
+import ipaddress
+import colander
+
+from rhodecode.translation import _
+
+
+def ip_addr_validator(node, value):
+    try:
+        # this raises an ValueError if address is not IpV4 or IpV6
+        ipaddress.ip_network(value, strict=False)
+    except ValueError:
+        msg = _(u'Please enter a valid IPv4 or IpV6 address')
+        raise colander.Invalid(node, msg)
+
+
+
+

rhodecode/public/502.html

@@ -0,0 +1,44 b''
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>Error - 502 Bad Gateway</title>
+        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+        <meta name="robots" content="index, nofollow"/>
+
+        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+
+        <style>body { background:#eeeeee; }</style>
+
+    </head>
+
+    <body>
+
+        <div class="wrapper error_page">
+            <div class="main-content">
+                <h1>
+                    502 Bad Gateway | <span class="error_message">Backend server is unreachable</span>
+                </h1>
+                <div class="inner-column">
+                    <h4>Possible Cause</h4>
+                    <ul>
+                        <li>The server is beeing restarted.</li>
+                        <li>The server is overloaded.</li>
+                        <li>The link may be incorrect.</li>
+                    </ul>
+                </div>
+                <div class="inner-column">
+                    <h4>Support</h4>
+                    <p>For support, go to <a href="https://rhodecode.com/help/" target="_blank">Support</a>.
+                       It may be useful to include your log file; see the log file locations <a href="https://rhodecode.com/r1/enterprise/docs/admin-system-overview/">here</a>.
+                    </p>
+                </div>
+                <div class="inner-column">
+                    <h4>Documentation</h4>
+                    <p>For more information, see <a href="https://rhodecode.com/r1/enterprise/docs/">docs.rhodecode.com</a>.</p>
+                </div>
+            </div>
+        </div>
+
+    </body>
+
+</html>

rhodecode/public/css/deform.less

@@ -0,0 +1,91 b''
+.deform {
+
+  * {
+    box-sizing: border-box;
+  }
+
+  .required:after {
+    color: #e32;
+    content: '*';
+    display:inline;
+  }
+
+  .control-label {
+    width: 200px;
+    float: left;
+  }
+  .control-inputs {
+    width: 400px;
+    float: left;
+  }
+  .form-group .radio, .form-group .checkbox {
+      position: relative;
+      display: block;
+      /* margin-bottom: 10px; */
+  }
+
+  .form-group {
+    clear: left;
+  }
+
+  .form-control {
+    width: 100%;
+  }
+
+  .error-block {
+    color: red;
+  }
+
+  .deform-seq-container .control-inputs {
+    width: 100%;
+  }
+
+  .deform-seq-container .deform-seq-item-handle {
+    width: 8.3%;
+    float: left;
+  }
+
+  .deform-seq-container .deform-seq-item-group {
+    width: 91.6%;
+    float: left;
+  }
+
+  .form-control {
+      input {
+        height: 40px;
+      }
+      input[type=checkbox], input[type=radio] {
+        height: auto;
+      }
+      select {
+        height: 40px;
+      }
+  }
+
+  .form-control.select2-container { height: 40px; }
+
+  .deform-two-field-sequence .deform-seq-container .deform-seq-item label {
+      display: none;
+  }
+  .deform-two-field-sequence .deform-seq-container .deform-seq-item:first-child label {
+      display: block;
+  }
+  .deform-two-field-sequence .deform-seq-container .deform-seq-item .panel-heading {
+      display: none;
+  }
+  .deform-two-field-sequence .deform-seq-container .deform-seq-item.form-group {
+      background: red;
+  }
+  .deform-two-field-sequence .deform-seq-container .deform-seq-item .deform-seq-item-group .form-group {
+      width: 45%; padding: 0 2px; float: left; clear: none;
+  }
+  .deform-two-field-sequence .deform-seq-container .deform-seq-item .deform-seq-item-group > .panel {
+      padding: 0;
+      margin: 5px 0;
+      border: none;
+  }
+  .deform-two-field-sequence .deform-seq-container .deform-seq-item .deform-seq-item-group > .panel > .panel-body {
+      padding: 0;
+  }
+
+}

rhodecode/public/css/toastr.less

@@ -0,0 +1,268 b''
+// Mix-ins
+.borderRadius(@radius) {
+  -moz-border-radius: @radius;
+  -webkit-border-radius: @radius;
+  border-radius: @radius;
+}
+
+.boxShadow(@boxShadow) {
+  -moz-box-shadow: @boxShadow;
+  -webkit-box-shadow: @boxShadow;
+  box-shadow: @boxShadow;
+}
+
+.opacity(@opacity) {
+  @opacityPercent: @opacity * 100;
+  opacity: @opacity;
+  -ms-filter: ~"progid:DXImageTransform.Microsoft.Alpha(Opacity=@{opacityPercent})";
+  filter: ~"alpha(opacity=@{opacityPercent})";
+}
+
+.wordWrap(@wordWrap: break-word) {
+  -ms-word-wrap: @wordWrap;
+  word-wrap: @wordWrap;
+}
+
+// Variables
+@black: #000000;
+@grey: #999999;
+@light-grey: #CCCCCC;
+@white: #FFFFFF;
+@near-black: #030303;
+@green: #51A351;
+@red: #BD362F;
+@blue: #2F96B4;
+@orange: #F89406;
+@default-container-opacity: .8;
+
+// Styles
+.toast-title {
+  font-weight: bold;
+}
+
+.toast-message {
+  .wordWrap();
+
+  a,
+  label {
+    color: @near-black;
+  }
+
+  a:hover {
+    color: @light-grey;
+    text-decoration: none;
+  }
+}
+
+.toast-close-button {
+  position: relative;
+  right: -0.3em;
+  top: -0.3em;
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  color: @black;
+  -webkit-text-shadow: 0 1px 0 rgba(255,255,255,1);
+  text-shadow: 0 1px 0 rgba(255,255,255,1);
+  .opacity(0.8);
+
+  &:hover,
+  &:focus {
+    color: @black;
+    text-decoration: none;
+    cursor: pointer;
+    .opacity(0.4);
+  }
+}
+
+/*Additional properties for button version
+ iOS requires the button element instead of an anchor tag.
+ If you want the anchor version, it requires `href="#"`.*/
+button.toast-close-button {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+}
+
+//#endregion
+
+.toast-top-center {
+  top: 0;
+  right: 0;
+  width: 100%;
+}
+
+.toast-bottom-center {
+  bottom: 0;
+  right: 0;
+  width: 100%;
+}
+
+.toast-top-full-width {
+  top: 0;
+  right: 0;
+  width: 100%;
+}
+
+.toast-bottom-full-width {
+  bottom: 0;
+  right: 0;
+  width: 100%;
+}
+
+.toast-top-left {
+  top: 12px;
+  left: 12px;
+}
+
+.toast-top-right {
+  top: 12px;
+  right: 12px;
+}
+
+.toast-bottom-right {
+  right: 12px;
+  bottom: 12px;
+}
+
+.toast-bottom-left {
+  bottom: 12px;
+  left: 12px;
+}
+
+#toast-container {
+  position: fixed;
+  z-index: 999999;
+  // The container should not be clickable.
+  pointer-events: none;
+  * {
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+
+  > div {
+    position: relative;
+    // The toast itself should be clickable.
+    pointer-events: auto;
+    overflow: hidden;
+    margin: 0 0 6px;
+    padding: 15px;
+    width: 300px;
+    .borderRadius(1px 1px 1px 1px);
+    background-position: 15px center;
+    background-repeat: no-repeat;
+    color: @near-black;
+    .opacity(@default-container-opacity);
+  }
+
+  > :hover {
+    .opacity(1);
+    cursor: pointer;
+  }
+
+  > .toast-info {
+    //background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=") !important;
+  }
+
+  > .toast-error {
+    //background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=") !important;
+  }
+
+  > .toast-success {
+    //background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==") !important;
+  }
+
+  > .toast-warning {
+    //background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=") !important;
+  }
+
+  /*overrides*/
+  &.toast-top-center > div,
+  &.toast-bottom-center > div {
+    width: 400px;
+    margin-left: auto;
+    margin-right: auto;
+  }
+
+  &.toast-top-full-width > div,
+  &.toast-bottom-full-width > div {
+    width: 96%;
+    margin-left: auto;
+    margin-right: auto;
+  }
+}
+
+.toast {
+  border-color: @near-black;
+  border-style: solid;
+  border-width: 2px 2px 2px 25px;
+  background-color: @white;
+}
+
+.toast-success {
+  border-color: @green;
+}
+
+.toast-error {
+  border-color: @red;
+}
+
+.toast-info {
+  border-color: @blue;
+}
+
+.toast-warning {
+  border-color: @orange;
+}
+
+.toast-progress {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  height: 4px;
+  background-color: @black;
+  .opacity(0.4);
+}
+
+/*Responsive Design*/
+
+@media all and (max-width: 240px) {
+  #toast-container {
+
+    > div {
+      padding: 8px;
+      width: 11em;
+    }
+
+    & .toast-close-button {
+      right: -0.2em;
+      top: -0.2em;
+    }
+  }
+}
+
+@media all and (min-width: 241px) and (max-width: 480px) {
+  #toast-container {
+    > div {
+      padding: 8px;
+      width: 18em;
+    }
+
+    & .toast-close-button {
+      right: -0.2em;
+      top: -0.2em;
+    }
+  }
+}
+
+@media all and (min-width: 481px) and (max-width: 768px) {
+  #toast-container {
+    > div {
+      padding: 15px;
+      width: 25em;
+    }
+  }
+}

rhodecode/public/js/rhodecode/i18n/js_translations.js

@@ -0,0 +1,68 b''
+// AUTO GENERATED FILE FOR Babel JS-GETTEXT EXTRACTORS, DO NOT CHANGE
+_gettext('Add another comment');
+_gettext('Comment text will be set automatically based on currently selected status ({0}) ...');
+_gettext('Follow');
+_gettext('Loading ...');
+_gettext('Loading failed');
+_gettext('Loading more results...');
+_gettext('No bookmarks available yet.');
+_gettext('No branches available yet.');
+_gettext('No gists available yet.');
+_gettext('No matches found');
+_gettext('No matching files');
+_gettext('No pull requests available yet.');
+_gettext('No repositories available yet.');
+_gettext('No repository groups available yet.');
+_gettext('No results');
+_gettext('No tags available yet.');
+_gettext('No user groups available yet.');
+_gettext('No users available yet.');
+_gettext('One result is available, press enter to select it.');
+_gettext('Open new pull request');
+_gettext('Open new pull request for selected commit');
+_gettext('Please delete {0} character');
+_gettext('Please delete {0} characters');
+_gettext('Please enter {0} or more character');
+_gettext('Please enter {0} or more characters');
+_gettext('Searching...');
+_gettext('Selection link');
+_gettext('Set status to Approved');
+_gettext('Set status to Rejected');
+_gettext('Show more');
+_gettext('Show selected commit __S');
+_gettext('Show selected commits __S ... __E');
+_gettext('Start following this repository');
+_gettext('Status Review');
+_gettext('Stop following this repository');
+_gettext('Submitting...');
+_gettext('Unfollow');
+_gettext('Updating...');
+_gettext('You can only select {0} item');
+_gettext('You can only select {0} items');
+_gettext('disabled');
+_gettext('enabled');
+_gettext('file');
+_gettext('files');
+_gettext('in {0}');
+_gettext('in {0} and {1}');
+_gettext('in {0}, {1}');
+_gettext('just now');
+_gettext('specify commit');
+_gettext('truncated result');
+_gettext('truncated results');
+_gettext('{0} active out of {1} users');
+_gettext('{0} ago');
+_gettext('{0} and {1}');
+_gettext('{0} and {1} ago');
+_gettext('{0} day');
+_gettext('{0} days');
+_gettext('{0} hour');
+_gettext('{0} hours');
+_gettext('{0} min');
+_gettext('{0} month');
+_gettext('{0} months');
+_gettext('{0} results are available, use up and down arrow keys to navigate.');
+_gettext('{0} sec');
+_gettext('{0} year');
+_gettext('{0} years');
+_gettext('{0}, {1} ago');

rhodecode/public/js/src/deform.js

@@ -0,0 +1,194 b''
+/*
+ * Register a top-level callback to the deform.load() function
+ * this will be called when the DOM has finished loading. No need
+ * to include the call at the end of the page.
+ */
+
+$(document).ready(function(){
+    deform.load();
+});
+
+
+var deform_loaded = false;
+
+var deform  = {
+    callbacks: [],
+
+    addCallback: function (oid, callback) {
+        deform.callbacks.push([oid, callback]);
+    },
+
+    clearCallbacks: function () {
+        deform.callbacks = [];
+    },
+
+    load: function() {
+      $(function() {
+        if (!deform_loaded) {
+            deform.processCallbacks();
+            deform.focusFirstInput();
+            deform_loaded = true;
+      }});
+    },
+
+
+    processCallbacks: function () {
+        $(deform.callbacks).each(function(num, item) {
+            var oid = item[0];
+            var callback = item[1];
+            callback(oid);
+            }
+            );
+        deform.clearCallbacks();
+    },
+
+    addSequenceItem: function (protonode, before) {
+        // - Clone the prototype node and add it before the "before" node.
+        //   Also ensure any callbacks are run for the widget.
+
+        // In order to avoid breaking accessibility:
+        //
+        // - Find each tag within the prototype node with an id
+        //   that has the string ``deformField(\d+)`` within it, and modify
+        //   its id to have a random component.
+        // - For each label referencing an change id, change the label's
+        //   for attribute to the new id.
+
+        var fieldmatch = /deformField(\d+)/;
+        var namematch = /(.+)?-[#]{3}/;
+        var code = protonode.attr('prototype');
+        var html = decodeURIComponent(code);
+        var $htmlnode = $(html);
+        var $idnodes = $htmlnode.find('[id]');
+        var $namednodes = $htmlnode.find('[name]');
+        var genid = deform.randomString(6);
+        var idmap = {};
+
+        // replace ids containing ``deformField`` and associated label for=
+        // items which point at them
+
+        $idnodes.each(function(idx, node) {
+            var $node = $(node);
+            var oldid = $node.attr('id');
+            var newid = oldid.replace(fieldmatch, "deformField$1-" + genid);
+            $node.attr('id', newid);
+            idmap[oldid] = newid;
+            var labelselector = 'label[for=' + oldid + ']';
+            var $fornodes = $htmlnode.find(labelselector);
+            $fornodes.attr('for', newid);
+            });
+
+        // replace names a containing ```deformField`` like we do for ids
+
+        $namednodes.each(function(idx, node) {
+            var $node = $(node);
+            var oldname = $node.attr('name');
+            var newname = oldname.replace(fieldmatch, "deformField$1-" + genid);
+            $node.attr('name', newname);
+            });
+
+        $htmlnode.insertBefore(before);
+
+        $(deform.callbacks).each(function(num, item) {
+            var oid = item[0];
+            var callback = item[1];
+            var newid = idmap[oid];
+            if (newid) {
+                callback(newid);
+                }
+            });
+
+        deform.clearCallbacks();
+        var old_len = parseInt(before.attr('now_len')||'0', 10);
+        before.attr('now_len', old_len + 1);
+        // we added something to the dom, trigger a change event
+        var e = jQuery.Event("change");
+        $('#deform').trigger(e);
+    },
+
+    appendSequenceItem: function(node) {
+        var $oid_node = $(node).closest('.deform-seq');
+        var $proto_node = $oid_node.find('.deform-proto').first();
+        var $before_node = $oid_node.find('.deform-insert-before').last();
+        var min_len = parseInt($before_node.attr('min_len')||'0', 10);
+        var max_len = parseInt($before_node.attr('max_len')||'9999', 10);
+        var now_len = parseInt($before_node.attr('now_len')||'0', 10);
+        var orderable = parseInt($before_node.attr('orderable')||'0', 10);
+
+        if (now_len < max_len) {
+          deform.addSequenceItem($proto_node, $before_node);
+            deform.processSequenceButtons($oid_node, min_len, max_len,
+                                          now_len + 1, orderable);
+        }
+        return false;
+    },
+
+    removeSequenceItem: function(clicked) {
+        var $item_node = $(clicked).closest('.deform-seq-item');
+        var $oid_node = $item_node.closest('.deform-seq');
+        var $before_node = $oid_node.find('.deform-insert-before').last();
+        var min_len = parseInt($before_node.attr('min_len')||'0', 10);
+        var max_len = parseInt($before_node.attr('max_len')||'9999', 10);
+        var now_len = parseInt($before_node.attr('now_len')||'0', 10);
+        var orderable = parseInt($before_node.attr('orderable')||'0', 10);
+        if (now_len > min_len) {
+            $before_node.attr('now_len', now_len - 1);
+            $item_node.remove();
+            deform.processSequenceButtons($oid_node, min_len, max_len,
+                                          now_len-1, orderable);
+        }
+        // we removed something from the dom, trigger a change event
+        var e = jQuery.Event("change");
+        $('#deform').trigger(e);
+        return false;
+    },
+
+    processSequenceButtons: function(oid_node, min_len, max_len, now_len,
+                                     orderable) {
+        orderable = !!orderable; // convert to bool
+        var has_multiple = now_len > 1;
+        var $ul = oid_node.find('.deform-seq-container').not(oid_node.find('.deform-seq-container .deform-seq-container'));
+        var $lis = $ul.find('.deform-seq-item').not($ul.find('.deform-seq-container .deform-seq-item'));
+        var show_closebutton = now_len > min_len;
+        var show_addbutton = now_len < max_len;
+        $lis.find('.deform-close-button').not($lis.find('.deform-seq-container .deform-close-button')).toggle(show_closebutton);
+        oid_node.find('.deform-seq-add').not(oid_node.find('.deform-seq-container .deform-seq-add')).toggle(show_addbutton);
+        $lis.find('.deform-order-button').not($lis.find('.deform-seq-container .deform-order-button')).toggle(orderable && has_multiple);
+     },
+
+    focusFirstInput: function (el) {
+        el = el || document.body;
+        var input = $(el).find(':input')
+          .filter('[id ^= deformField]')
+          .filter('[type != hidden]')
+          .first();
+        if (input) {
+            var raw = input.get(0);
+            if (raw) {
+                if (raw.type === 'text' || raw.type === 'file' ||
+                    raw.type == 'password' || raw.type == 'text' ||
+                    raw.type == 'textarea') {
+                    if (!input.hasClass("hasDatepicker")) {
+                        input.focus();
+                    }
+                }
+            }
+        }
+    },
+
+    randomString: function (length) {
+        var chr='0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        chr = chr.split('');
+
+        if (! length) {
+            length = Math.floor(Math.random() * chr.length);
+        }
+
+        var str = '';
+        for (var i = 0; i < length; i++) {
+            str += chr[Math.floor(Math.random() * chr.length)];
+        }
+        return str;
+    }
+
+};

rhodecode/public/js/src/plugins/toastr.js

@@ -0,0 +1,435 b''
+/*
+ * Toastr
+ * Copyright 2012-2015
+ * Authors: John Papa, Hans Fjällemark, and Tim Ferrell.
+ * All Rights Reserved.
+ * Use, reproduction, distribution, and modification of this code is subject to the terms and
+ * conditions of the MIT license, available at http://www.opensource.org/licenses/mit-license.php
+ *
+ * ARIA Support: Greta Krafsig
+ *
+ * Project: https://github.com/CodeSeven/toastr
+ */
+/* global define */
+(function (define) {
+    define(['jquery'], function ($) {
+        return (function () {
+            var $container;
+            var listener;
+            var toastId = 0;
+            var toastType = {
+                error: 'error',
+                info: 'info',
+                success: 'success',
+                warning: 'warning'
+            };
+
+            var toastr = {
+                clear: clear,
+                remove: remove,
+                error: error,
+                getContainer: getContainer,
+                info: info,
+                options: {},
+                subscribe: subscribe,
+                success: success,
+                version: '2.1.2',
+                warning: warning
+            };
+
+            var previousToast;
+
+            return toastr;
+
+            ////////////////
+
+            function error(message, title, optionsOverride) {
+                return notify({
+                    type: toastType.error,
+                    iconClass: getOptions().iconClasses.error,
+                    message: message,
+                    optionsOverride: optionsOverride,
+                    title: title
+                });
+            }
+
+            function getContainer(options, create) {
+                if (!options) { options = getOptions(); }
+                $container = $('#' + options.containerId);
+                if ($container.length) {
+                    return $container;
+                }
+                if (create) {
+                    $container = createContainer(options);
+                }
+                return $container;
+            }
+
+            function info(message, title, optionsOverride) {
+                return notify({
+                    type: toastType.info,
+                    iconClass: getOptions().iconClasses.info,
+                    message: message,
+                    optionsOverride: optionsOverride,
+                    title: title
+                });
+            }
+
+            function subscribe(callback) {
+                listener = callback;
+            }
+
+            function success(message, title, optionsOverride) {
+                return notify({
+                    type: toastType.success,
+                    iconClass: getOptions().iconClasses.success,
+                    message: message,
+                    optionsOverride: optionsOverride,
+                    title: title
+                });
+            }
+
+            function warning(message, title, optionsOverride) {
+                return notify({
+                    type: toastType.warning,
+                    iconClass: getOptions().iconClasses.warning,
+                    message: message,
+                    optionsOverride: optionsOverride,
+                    title: title
+                });
+            }
+
+            function clear($toastElement, clearOptions) {
+                var options = getOptions();
+                if (!$container) { getContainer(options); }
+                if (!clearToast($toastElement, options, clearOptions)) {
+                    clearContainer(options);
+                }
+            }
+
+            function remove($toastElement) {
+                var options = getOptions();
+                if (!$container) { getContainer(options); }
+                if ($toastElement && $(':focus', $toastElement).length === 0) {
+                    removeToast($toastElement);
+                    return;
+                }
+                if ($container.children().length) {
+                    $container.remove();
+                }
+            }
+
+            // internal functions
+
+            function clearContainer (options) {
+                var toastsToClear = $container.children();
+                for (var i = toastsToClear.length - 1; i >= 0; i--) {
+                    clearToast($(toastsToClear[i]), options);
+                }
+            }
+
+            function clearToast ($toastElement, options, clearOptions) {
+                var force = clearOptions && clearOptions.force ? clearOptions.force : false;
+                if ($toastElement && (force || $(':focus', $toastElement).length === 0)) {
+                    $toastElement[options.hideMethod]({
+                        duration: options.hideDuration,
+                        easing: options.hideEasing,
+                        complete: function () { removeToast($toastElement); }
+                    });
+                    return true;
+                }
+                return false;
+            }
+
+            function createContainer(options) {
+                $container = $('<div/>')
+                    .attr('id', options.containerId)
+                    .addClass(options.positionClass)
+                    .attr('aria-live', 'polite')
+                    .attr('role', 'alert');
+
+                $container.appendTo($(options.target));
+                return $container;
+            }
+
+            function getDefaults() {
+                return {
+                    tapToDismiss: true,
+                    toastClass: 'toast',
+                    containerId: 'toast-container',
+                    debug: false,
+
+                    showMethod: 'fadeIn', //fadeIn, slideDown, and show are built into jQuery
+                    showDuration: 300,
+                    showEasing: 'swing', //swing and linear are built into jQuery
+                    onShown: undefined,
+                    hideMethod: 'fadeOut',
+                    hideDuration: 1000,
+                    hideEasing: 'swing',
+                    onHidden: undefined,
+                    closeMethod: false,
+                    closeDuration: false,
+                    closeEasing: false,
+
+                    extendedTimeOut: 1000,
+                    iconClasses: {
+                        error: 'toast-error',
+                        info: 'toast-info',
+                        success: 'toast-success',
+                        warning: 'toast-warning'
+                    },
+                    iconClass: 'toast-info',
+                    positionClass: 'toast-top-right',
+                    timeOut: 5000, // Set timeOut and extendedTimeOut to 0 to make it sticky
+                    titleClass: 'toast-title',
+                    messageClass: 'toast-message',
+                    escapeHtml: false,
+                    target: 'body',
+                    closeHtml: '<button type="button">&times;</button>',
+                    newestOnTop: true,
+                    preventDuplicates: false,
+                    progressBar: false
+                };
+            }
+
+            function publish(args) {
+                if (!listener) { return; }
+                listener(args);
+            }
+
+            function notify(map) {
+                var options = getOptions();
+                var iconClass = map.iconClass || options.iconClass;
+
+                if (typeof (map.optionsOverride) !== 'undefined') {
+                    options = $.extend(options, map.optionsOverride);
+                    iconClass = map.optionsOverride.iconClass || iconClass;
+                }
+
+                if (shouldExit(options, map)) { return; }
+
+                toastId++;
+
+                $container = getContainer(options, true);
+
+                var intervalId = null;
+                var $toastElement = $('<div/>');
+                var $titleElement = $('<div/>');
+                var $messageElement = $('<div/>');
+                var $progressElement = $('<div/>');
+                var $closeElement = $(options.closeHtml);
+                var progressBar = {
+                    intervalId: null,
+                    hideEta: null,
+                    maxHideTime: null
+                };
+                var response = {
+                    toastId: toastId,
+                    state: 'visible',
+                    startTime: new Date(),
+                    options: options,
+                    map: map
+                };
+
+                personalizeToast();
+
+                displayToast();
+
+                handleEvents();
+
+                publish(response);
+
+                if (options.debug && console) {
+                    console.log(response);
+                }
+
+                return $toastElement;
+
+                function escapeHtml(source) {
+                    if (source == null)
+                        source = "";
+
+                    return new String(source)
+                        .replace(/&/g, '&amp;')
+                        .replace(/"/g, '&quot;')
+                        .replace(/'/g, '&#39;')
+                        .replace(/</g, '&lt;')
+                        .replace(/>/g, '&gt;');
+                }
+
+                function personalizeToast() {
+                    setIcon();
+                    setTitle();
+                    setMessage();
+                    setCloseButton();
+                    setProgressBar();
+                    setSequence();
+                }
+
+                function handleEvents() {
+                    $toastElement.hover(stickAround, delayedHideToast);
+                    if (!options.onclick && options.tapToDismiss) {
+                        $toastElement.click(hideToast);
+                    }
+
+                    if (options.closeButton && $closeElement) {
+                        $closeElement.click(function (event) {
+                            if (event.stopPropagation) {
+                                event.stopPropagation();
+                            } else if (event.cancelBubble !== undefined && event.cancelBubble !== true) {
+                                event.cancelBubble = true;
+                            }
+                            hideToast(true);
+                        });
+                    }
+
+                    if (options.onclick) {
+                        $toastElement.click(function (event) {
+                            options.onclick(event);
+                            hideToast();
+                        });
+                    }
+                }
+
+                function displayToast() {
+                    $toastElement.hide();
+
+                    $toastElement[options.showMethod](
+                        {duration: options.showDuration, easing: options.showEasing, complete: options.onShown}
+                    );
+
+                    if (options.timeOut > 0) {
+                        intervalId = setTimeout(hideToast, options.timeOut);
+                        progressBar.maxHideTime = parseFloat(options.timeOut);
+                        progressBar.hideEta = new Date().getTime() + progressBar.maxHideTime;
+                        if (options.progressBar) {
+                            progressBar.intervalId = setInterval(updateProgress, 10);
+                        }
+                    }
+                }
+
+                function setIcon() {
+                    if (map.iconClass) {
+                        $toastElement.addClass(options.toastClass).addClass(iconClass);
+                    }
+                }
+
+                function setSequence() {
+                    if (options.newestOnTop) {
+                        $container.prepend($toastElement);
+                    } else {
+                        $container.append($toastElement);
+                    }
+                }
+
+                function setTitle() {
+                    if (map.title) {
+                        $titleElement.append(!options.escapeHtml ? map.title : escapeHtml(map.title)).addClass(options.titleClass);
+                        $toastElement.append($titleElement);
+                    }
+                }
+
+                function setMessage() {
+                    if (map.message) {
+                        $messageElement.append(!options.escapeHtml ? map.message : escapeHtml(map.message)).addClass(options.messageClass);
+                        $toastElement.append($messageElement);
+                    }
+                }
+
+                function setCloseButton() {
+                    if (options.closeButton) {
+                        $closeElement.addClass('toast-close-button').attr('role', 'button');
+                        $toastElement.prepend($closeElement);
+                    }
+                }
+
+                function setProgressBar() {
+                    if (options.progressBar) {
+                        $progressElement.addClass('toast-progress');
+                        $toastElement.prepend($progressElement);
+                    }
+                }
+
+                function shouldExit(options, map) {
+                    if (options.preventDuplicates) {
+                        if (map.message === previousToast) {
+                            return true;
+                        } else {
+                            previousToast = map.message;
+                        }
+                    }
+                    return false;
+                }
+
+                function hideToast(override) {
+                    var method = override && options.closeMethod !== false ? options.closeMethod : options.hideMethod;
+                    var duration = override && options.closeDuration !== false ?
+                        options.closeDuration : options.hideDuration;
+                    var easing = override && options.closeEasing !== false ? options.closeEasing : options.hideEasing;
+                    if ($(':focus', $toastElement).length && !override) {
+                        return;
+                    }
+                    clearTimeout(progressBar.intervalId);
+                    return $toastElement[method]({
+                        duration: duration,
+                        easing: easing,
+                        complete: function () {
+                            removeToast($toastElement);
+                            if (options.onHidden && response.state !== 'hidden') {
+                                options.onHidden();
+                            }
+                            response.state = 'hidden';
+                            response.endTime = new Date();
+                            publish(response);
+                        }
+                    });
+                }
+
+                function delayedHideToast() {
+                    if (options.timeOut > 0 || options.extendedTimeOut > 0) {
+                        intervalId = setTimeout(hideToast, options.extendedTimeOut);
+                        progressBar.maxHideTime = parseFloat(options.extendedTimeOut);
+                        progressBar.hideEta = new Date().getTime() + progressBar.maxHideTime;
+                    }
+                }
+
+                function stickAround() {
+                    clearTimeout(intervalId);
+                    progressBar.hideEta = 0;
+                    $toastElement.stop(true, true)[options.showMethod](
+                        {duration: options.showDuration, easing: options.showEasing}
+                    );
+                }
+
+                function updateProgress() {
+                    var percentage = ((progressBar.hideEta - (new Date().getTime())) / progressBar.maxHideTime) * 100;
+                    $progressElement.width(percentage + '%');
+                }
+            }
+
+            function getOptions() {
+                return $.extend({}, getDefaults(), toastr.options);
+            }
+
+            function removeToast($toastElement) {
+                if (!$container) { $container = getContainer(); }
+                if ($toastElement.is(':visible')) {
+                    return;
+                }
+                $toastElement.remove();
+                $toastElement = null;
+                if ($container.children().length === 0) {
+                    $container.remove();
+                    previousToast = undefined;
+                }
+            }
+
+        })();
+    });
+}(typeof define === 'function' && define.amd ? define : function (deps, factory) {
+    if (typeof module !== 'undefined' && module.exports) { //Node
+        module.exports = factory(require('jquery'));
+    } else {
+        window.toastr = factory(window.jQuery);
+    }
+}));

rhodecode/public/js/src/rhodecode/connection_controller.js

@@ -0,0 +1,219 b''
+"use strict";
+/** leak object to top level scope **/
+var ccLog = undefined;
+// global code-mirror logger;, to enable run
+// Logger.get('ConnectionController').setLevel(Logger.DEBUG)
+ccLog = Logger.get('ConnectionController');
+ccLog.setLevel(Logger.OFF);
+
+var ConnectionController;
+var connCtrlr;
+var registerViewChannels;
+
+(function () {
+    ConnectionController = function (webappUrl, serverUrl, urls) {
+        var self = this;
+
+        var channels = ['broadcast'];
+        this.state = {
+            open: false,
+            webappUrl: webappUrl,
+            serverUrl: serverUrl,
+            connId: null,
+            socket: null,
+            channels: channels,
+            heartbeat: null,
+            channelsInfo: {},
+            urls: urls
+        };
+        this.channelNameParsers = [];
+
+        this.addChannelNameParser = function (fn) {
+            if (this.channelNameParsers.indexOf(fn) === -1) {
+                this.channelNameParsers.push(fn);
+            }
+        };
+
+        this.listen = function () {
+            if (window.WebSocket) {
+                ccLog.debug('attempting to create socket');
+                var socket_url = self.state.serverUrl + "/ws?conn_id=" + self.state.connId;
+                var socket_conf = {
+                    url: socket_url,
+                    handleAs: 'json',
+                    headers: {
+                        "Accept": "application/json",
+                        "Content-Type": "application/json"
+                    }
+                };
+                self.state.socket = new WebSocket(socket_conf.url);
+
+                self.state.socket.onopen = function (event) {
+                    ccLog.debug('open event', event);
+                    if (self.state.heartbeat === null) {
+                        self.state.heartbeat = setInterval(function () {
+                            if (self.state.socket.readyState === WebSocket.OPEN) {
+                                self.state.socket.send('heartbeat');
+                            }
+                        }, 10000)
+                    }
+                };
+                self.state.socket.onmessage = function (event) {
+                    var data = $.parseJSON(event.data);
+                    for (var i = 0; i < data.length; i++) {
+                        if (data[i].message.topic) {
+                            ccLog.debug('publishing',
+                                data[i].message.topic, data[i]);
+                            $.Topic(data[i].message.topic).publish(data[i])
+                        }
+                        else {
+                            ccLog.warn('unhandled message', data);
+                        }
+                    }
+                };
+                self.state.socket.onclose = function (event) {
+                    ccLog.debug('closed event', event);
+                    setTimeout(function () {
+                        self.connect(true);
+                    }, 5000);
+                };
+
+                self.state.socket.onerror = function (event) {
+                    ccLog.debug('error event', event);
+                };
+            }
+            else {
+                ccLog.debug('attempting to create long polling connection');
+                var poolUrl = self.state.serverUrl + "/listen?conn_id=" + self.state.connId;
+                self.state.socket = $.ajax({
+                    url: poolUrl
+                }).done(function (data) {
+                    ccLog.debug('data', data);
+                    var data = $.parseJSON(data);
+                    for (var i = 0; i < data.length; i++) {
+                        if (data[i].message.topic) {
+                            ccLog.info('publishing',
+                                data[i].message.topic, data[i]);
+                            $.Topic(data[i].message.topic).publish(data[i])
+                        }
+                        else {
+                            ccLog.warn('unhandled message', data);
+                        }
+                    }
+                    self.listen();
+                }).fail(function () {
+                    ccLog.debug('longpoll error');
+                    setTimeout(function () {
+                        self.connect(true);
+                    }, 5000);
+                });
+            }
+
+        };
+
+        this.connect = function (create_new_socket) {
+            var connReq = {'channels': self.state.channels};
+            ccLog.debug('try obtaining connection info', connReq);
+            $.ajax({
+                url: self.state.urls.connect,
+                type: "POST",
+                contentType: "application/json",
+                data: JSON.stringify(connReq),
+                dataType: "json"
+            }).done(function (data) {
+                ccLog.debug('Got connection:', data.conn_id);
+                self.state.channels = data.channels;
+                self.state.channelsInfo = data.channels_info;
+                self.state.connId = data.conn_id;
+                if (create_new_socket) {
+                    self.listen();
+                }
+                self.update();
+            }).fail(function () {
+                setTimeout(function () {
+                    self.connect(create_new_socket);
+                }, 5000);
+            });
+            self.update();
+        };
+
+        this.subscribeToChannels = function (channels) {
+            var new_channels = [];
+            for (var i = 0; i < channels.length; i++) {
+                var channel = channels[i];
+                if (self.state.channels.indexOf(channel)) {
+                    self.state.channels.push(channel);
+                    new_channels.push(channel)
+                }
+            }
+            /**
+             * only execute the request if socket is present because subscribe
+             * can actually add channels before initial app connection
+             **/
+            if (new_channels && self.state.socket !== null) {
+                var connReq = {
+                    'channels': self.state.channels,
+                    'conn_id': self.state.connId
+                };
+                $.ajax({
+                    url: self.state.urls.subscribe,
+                    type: "POST",
+                    contentType: "application/json",
+                    data: JSON.stringify(connReq),
+                    dataType: "json"
+                }).done(function (data) {
+                    self.state.channels = data.channels;
+                    self.state.channelsInfo = data.channels_info;
+                    self.update();
+                });
+            }
+            self.update();
+        };
+
+        this.update = function () {
+            for (var key in this.state.channelsInfo) {
+                if (this.state.channelsInfo.hasOwnProperty(key)) {
+                    // update channels with latest info
+                    $.Topic('/connection_controller/channel_update').publish(
+                        {channel: key, state: this.state.channelsInfo[key]});
+                }
+            }
+            /**
+             * checks current channel list in state and if channel is not present
+             * converts them into executable "commands" and pushes them on topics
+             */
+            for (var i = 0; i < this.state.channels.length; i++) {
+                var channel = this.state.channels[i];
+                for (var j = 0; j < this.channelNameParsers.length; j++) {
+                    this.channelNameParsers[j](channel);
+                }
+            }
+        };
+
+        this.run = function () {
+            this.connect(true);
+        };
+
+        $.Topic('/connection_controller/subscribe').subscribe(
+            self.subscribeToChannels);
+    };
+
+    $.Topic('/plugins/__REGISTER__').subscribe(function (data) {
+        // enable chat controller
+        if (window.CHANNELSTREAM_SETTINGS && window.CHANNELSTREAM_SETTINGS.enabled) {
+            $(document).ready(function () {
+                connCtrlr.run();
+            });
+        }
+    });
+
+registerViewChannels = function (){
+    // subscribe to PR repo channel for PR's'
+    if (templateContext.pull_request_data.pull_request_id) {
+        var channelName = '/repo$' + templateContext.repo_name + '$/pr/' +
+            String(templateContext.pull_request_data.pull_request_id);
+        connCtrlr.state.channels.push(channelName);
+    }
+}
+
+})();

rhodecode/public/js/src/rhodecode/utils/notifications.js

@@ -0,0 +1,60 b''
+"use strict";
+
+toastr.options = {
+    "closeButton": true,
+    "debug": false,
+    "newestOnTop": false,
+    "progressBar": false,
+    "positionClass": "toast-top-center",
+    "preventDuplicates": false,
+    "onclick": null,
+    "showDuration": "300",
+    "hideDuration": "300",
+    "timeOut": "0",
+    "extendedTimeOut": "0",
+    "showEasing": "swing",
+    "hideEasing": "linear",
+    "showMethod": "fadeIn",
+    "hideMethod": "fadeOut"
+};
+
+function notifySystem(data) {
+    var notification = new Notification(data.message.level + ': ' + data.message.message);
+};
+
+function notifyToaster(data){
+    toastr[data.message.level](data.message.message);
+}
+
+function handleNotifications(data) {
+
+    if (!templateContext.rhodecode_user.notification_status && !data.testMessage) {
+        // do not act if notifications are disabled
+        return
+    }
+    // use only js notifications for now
+    var onlyJS = true;
+    if (!("Notification" in window) || onlyJS) {
+        // use legacy notificartion
+        notifyToaster(data);
+    }
+    else {
+        // Let's check whether notification permissions have already been granted
+        if (Notification.permission === "granted") {
+            notifySystem(data);
+        }
+        // Otherwise, we need to ask the user for permission
+        else if (Notification.permission !== 'denied') {
+            Notification.requestPermission(function (permission) {
+                if (permission === "granted") {
+                    notifySystem(data);
+                }
+            });
+        }
+        else{
+            notifyToaster(data);
+        }
+    }
+};
+
+$.Topic('/notifications').subscribe(handleNotifications);

rhodecode/public/js/src/rhodecode/utils/topics.js

@@ -0,0 +1,59 b''
+// # Copyright (C) 2010-2016  RhodeCode GmbH
+// #
+// # This program is free software: you can redistribute it and/or modify
+// # it under the terms of the GNU Affero General Public License, version 3
+// # (only), as published by the Free Software Foundation.
+// #
+// # This program is distributed in the hope that it will be useful,
+// # but WITHOUT ANY WARRANTY; without even the implied warranty of
+// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// # GNU General Public License for more details.
+// #
+// # You should have received a copy of the GNU Affero General Public License
+// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// #
+// # This program is dual-licensed. If you wish to learn more about the
+// # RhodeCode Enterprise Edition, including its added features, Support services,
+// # and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+var topics = {};
+jQuery.Topic = function (id) {
+    var callbacks, method,
+        topic = id && topics[id];
+
+    if (!topic) {
+        callbacks = jQuery.Callbacks();
+        topic = {
+            unhandledData: [],
+            publish: callbacks.fire,
+            prepare: function(){
+                for(var i=0; i< arguments.length; i++){
+                    this.unhandledData.push(arguments[i]);
+                }
+            },
+            prepareOrPublish: function(){
+                if (callbacks.has() === true){
+                    this.publish.apply(this, arguments);
+                }
+                else{
+                    this.prepare.apply(this, arguments);
+                }
+            },
+            processPrepared: function(){
+                var data = this.unhandledData;
+                this.unhandledData = [];
+                for(var i=0; i< data.length; i++){
+                    this.publish(data[i]);
+                }
+            },
+            subscribe: callbacks.add,
+            unsubscribe: callbacks.remove,
+            callbacks: callbacks
+        };
+        if (id) {
+            topics[id] = topic;
+        }
+    }
+    return topic;
+};

rhodecode/public/js/topics_list.txt

@@ -0,0 +1,4 b''
+/plugins/__REGISTER__ - launched after the onDomReady() code from rhodecode.js is executed
+/ui/plugins/code/anchor_focus - launched when rc starts to scroll on load to anchor on PR/Codeview
+/ui/plugins/code/comment_form_built - launched when injectInlineForm() is executed and the form object is created
+/notifications - shows new event notifications
  No newline at end of file

rhodecode/svn_support/__init__.py

@@ -0,0 +1,75 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+import os
+
+from rhodecode import events
+from rhodecode.lib.utils2 import str2bool
+
+from .subscribers import generate_config_subscriber
+from . import config_keys
+
+
+log = logging.getLogger(__name__)
+
+
+def includeme(config):
+    settings = config.registry.settings
+    _sanitize_settings_and_apply_defaults(settings)
+
+    if settings[config_keys.generate_config]:
+        config.add_subscriber(
+            generate_config_subscriber, events.RepoGroupEvent)
+
+
+def _sanitize_settings_and_apply_defaults(settings):
+    """
+    Set defaults, convert to python types and validate settings.
+    """
+    # Convert bool settings from string to bool.
+    settings[config_keys.generate_config] = str2bool(
+        settings.get(config_keys.generate_config, 'false'))
+    settings[config_keys.list_parent_path] = str2bool(
+        settings.get(config_keys.list_parent_path, 'true'))
+
+    # Set defaults if key not present.
+    settings.setdefault(config_keys.config_file_path, None)
+    settings.setdefault(config_keys.location_root, '/')
+    settings.setdefault(config_keys.parent_path_root, None)
+
+    # Append path separator to paths.
+    settings[config_keys.location_root] = _append_path_sep(
+        settings[config_keys.location_root])
+    settings[config_keys.parent_path_root] = _append_path_sep(
+        settings[config_keys.parent_path_root])
+
+    # Validate settings.
+    if settings[config_keys.generate_config]:
+        assert settings[config_keys.config_file_path] is not None
+
+
+def _append_path_sep(path):
+    """
+    Append the path separator if missing.
+    """
+    if isinstance(path, basestring) and not path.endswith(os.path.sep):
+        path += os.path.sep
+    return path

rhodecode/svn_support/config_keys.py

@@ -0,0 +1,28 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+# Definition of setting keys used to configure this module. Defined here to
+# avoid repetition of keys throughout the module.
+config_file_path = 'svn.proxy.config_file_path'
+generate_config = 'svn.proxy.generate_config'
+list_parent_path = 'svn.proxy.list_parent_path'
+location_root = 'svn.proxy.location_root'
+parent_path_root = 'svn.proxy.parent_path_root'

rhodecode/svn_support/subscribers.py

@@ -0,0 +1,31 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+from .utils import generate_mod_dav_svn_config
+
+
+def generate_config_subscriber(event):
+    """
+    Subscriber to the `rhodcode.events.RepoGroupEvent`. This triggers the
+    automatic generation of mod_dav_svn config file on repository group
+    changes.
+    """
+    generate_mod_dav_svn_config(event.request.registry.settings)

rhodecode/svn_support/templates/mod-dav-svn.conf.mako

@@ -0,0 +1,65 b''
+# Auto generated configuration for use with the Apache mod_dav_svn module.
+#
+# WARNING: Make sure your Apache instance which runs the mod_dav_svn module is
+#          only accessible by RhodeCode. Otherwise everyone is able to browse
+#          the repositories or run subversion operations (checkout/commit/etc.).
+#
+# The mod_dav_svn module does not support subversion repositories which are
+# organized in subfolders. To support the repository groups of RhodeCode it is
+# required to provide a <Location> block for each group pointing to the
+# repository group sub folder.
+#
+# To ease the configuration RhodeCode auto generates this file whenever a
+# repository group is created/changed/deleted. Auto generation can be configured
+# in the ini file.
+#
+# To include this configuration into your apache config you can use the
+# `Include` directive. See the following example snippet of a virtual host how
+# to include this configuration file.
+#
+#     <VirtualHost *:8080>
+#         ServerAdmin webmaster@localhost
+#         DocumentRoot /var/www/html
+#         ErrorLog ${'${APACHE_LOG_DIR}'}/error.log
+#         CustomLog ${'${APACHE_LOG_DIR}'}/access.log combined
+#         Include /path/to/generated/mod_dav_svn.conf
+#     </VirtualHost>
+
+
+<Location ${location_root}>
+    # The mod_dav_svn module takes the username from the apache request object.
+    # Without authorization this will be empty and no username is logged for the
+    # transactions. This will result in "(no author)" for each revision. The
+    # following directives implement a fake authentication that allows every
+    # username/password combination.
+    AuthType Basic
+    AuthName ${rhodecode_realm}
+    AuthBasicProvider anon
+    Anonymous *
+    Require valid-user
+
+    DAV svn
+    SVNParentPath ${parent_path_root}
+    SVNListParentPath ${'On' if svn_list_parent_path else 'Off'}
+
+    Allow from all
+    Order allow,deny
+</Location>
+
+% for location, parent_path in repo_group_paths:
+
+<Location ${location}>
+    AuthType Basic
+    AuthName ${rhodecode_realm}
+    AuthBasicProvider anon
+    Anonymous *
+    Require valid-user
+
+    DAV svn
+    SVNParentPath ${parent_path}
+    SVNListParentPath ${'On' if svn_list_parent_path else 'Off'}
+
+    Allow from all
+    Order allow,deny
+</Location>
+% endfor

rhodecode/svn_support/tests/test_mod_dav_svn_config.py

@@ -0,0 +1,146 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+import mock
+import re
+import shutil
+import tempfile
+
+from pyramid import testing
+
+from rhodecode.svn_support import config_keys, utils
+
+
+class TestModDavSvnConfig(object):
+    @classmethod
+    def setup_class(cls):
+        # Make mako renderer available in tests.
+        config = testing.setUp()
+        config.include('pyramid_mako')
+
+        # Temporary directory holding the generated config files.
+        cls.tempdir = tempfile.mkdtemp(suffix='pytest-mod-dav-svn')
+
+        cls.location_root = '/location/root'
+        cls.parent_path_root = '/parent/path/root'
+
+    @classmethod
+    def teardown_class(cls):
+        testing.tearDown()
+        shutil.rmtree(cls.tempdir, ignore_errors=True)
+
+    @classmethod
+    def get_settings(cls):
+        config_file_path = tempfile.mkstemp(
+            suffix='mod-dav-svn.conf', dir=cls.tempdir)[1]
+        return {
+            config_keys.config_file_path: config_file_path,
+            config_keys.location_root: cls.location_root,
+            config_keys.parent_path_root: cls.parent_path_root,
+            config_keys.list_parent_path: True,
+        }
+
+    @classmethod
+    def get_repo_groups(cls, count=1):
+        repo_groups = []
+        for num in range(0, count):
+            full_path = '/path/to/RepoGroup{}'.format(num)
+            repo_group_mock = mock.MagicMock()
+            repo_group_mock.full_path = full_path
+            repo_group_mock.full_path_splitted = full_path.split('/')
+            repo_groups.append(repo_group_mock)
+        return repo_groups
+
+    def assert_root_location_directive(self, config):
+        pattern = '<Location {location}>'.format(location=self.location_root)
+        assert len(re.findall(pattern, config)) == 1
+
+    def assert_group_location_directive(self, config, group_path):
+        pattern = '<Location {location}{group_path}>'.format(
+            location=self.location_root, group_path=group_path)
+        assert len(re.findall(pattern, config)) == 1
+
+    @mock.patch('rhodecode.svn_support.utils.RepoGroup')
+    def test_generate_mod_dav_svn_config(self, RepoGroupMock):
+        num_groups = 3
+        RepoGroupMock.get_all_repo_groups.return_value = self.get_repo_groups(
+            count=num_groups)
+
+        # Execute the method under test.
+        settings = self.get_settings()
+        utils.generate_mod_dav_svn_config(settings)
+
+        # Read generated file.
+        with open(settings[config_keys.config_file_path], 'r') as file_:
+            content = file_.read()
+
+        # Assert that one location directive exists for each repository group.
+        for group in self.get_repo_groups(count=num_groups):
+            self.assert_group_location_directive(content, group.full_path)
+
+        # Assert that the root location directive exists.
+        self.assert_root_location_directive(content)
+
+    @mock.patch('rhodecode.svn_support.utils.RepoGroup')
+    def test_list_parent_path_on(self, RepoGroupMock):
+        RepoGroupMock.get_all_repo_groups.return_value = self.get_repo_groups()
+
+        # Execute the method under test.
+        settings = self.get_settings()
+        settings[config_keys.list_parent_path] = True
+        utils.generate_mod_dav_svn_config(settings)
+
+        # Read generated file.
+        with open(settings[config_keys.config_file_path], 'r') as file_:
+            content = file_.read()
+
+        # Make assertions.
+        assert not re.search('SVNListParentPath\s+Off', content)
+        assert re.search('SVNListParentPath\s+On', content)
+
+    @mock.patch('rhodecode.svn_support.utils.RepoGroup')
+    def test_list_parent_path_off(self, RepoGroupMock):
+        RepoGroupMock.get_all_repo_groups.return_value = self.get_repo_groups()
+
+        # Execute the method under test.
+        settings = self.get_settings()
+        settings[config_keys.list_parent_path] = False
+        utils.generate_mod_dav_svn_config(settings)
+
+        # Read generated file.
+        with open(settings[config_keys.config_file_path], 'r') as file_:
+            content = file_.read()
+
+        # Make assertions.
+        assert re.search('SVNListParentPath\s+Off', content)
+        assert not re.search('SVNListParentPath\s+On', content)
+
+    @mock.patch('rhodecode.svn_support.utils.log')
+    def test_write_does_not_raise_on_error(self, LogMock):
+        """
+        Writing the configuration to file should never raise exceptions.
+        If e.g. path points to a place without write permissions.
+        """
+        utils._write_mod_dav_svn_config(
+            'content', '/dev/null/not/existing/path')
+
+        # Assert that we log the exception.
+        assert LogMock.exception.called

rhodecode/svn_support/utils.py

@@ -0,0 +1,83 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+import os
+
+from pyramid.renderers import render
+
+from rhodecode.lib.utils import get_rhodecode_realm
+from rhodecode.model.db import RepoGroup
+from . import config_keys
+
+
+log = logging.getLogger(__name__)
+
+
+def generate_mod_dav_svn_config(settings):
+    """
+    Generate the configuration file for use with subversion's mod_dav_svn
+    module. The configuration has to contain a <Location> block for each
+    available repository group because the mod_dav_svn module does not support
+    repositories organized in sub folders.
+    """
+    config = _render_mod_dav_svn_config(
+        settings[config_keys.parent_path_root],
+        settings[config_keys.list_parent_path],
+        settings[config_keys.location_root],
+        RepoGroup.get_all_repo_groups())
+    _write_mod_dav_svn_config(config, settings[config_keys.config_file_path])
+
+
+def _render_mod_dav_svn_config(
+        parent_path_root, list_parent_path, location_root, repo_groups):
+    """
+    Render mod_dav_svn configuration to string.
+    """
+    repo_group_paths = []
+    for repo_group in repo_groups:
+        group_path = repo_group.full_path_splitted
+        location = os.path.join(location_root, *group_path)
+        parent_path = os.path.join(parent_path_root, *group_path)
+        repo_group_paths.append((location, parent_path))
+
+    context = {
+        'location_root': location_root,
+        'parent_path_root': parent_path_root,
+        'repo_group_paths': repo_group_paths,
+        'svn_list_parent_path': list_parent_path,
+        'rhodecode_realm': get_rhodecode_realm(),
+    }
+
+    # Render the configuration template to string.
+    template = 'rhodecode:svn_support/templates/mod-dav-svn.conf.mako'
+    return render(template, context)
+
+
+def _write_mod_dav_svn_config(config, filepath):
+    """
+    Write mod_dav_svn config to file. Log on exceptions but do not raise.
+    """
+    try:
+        with open(filepath, 'w') as file_:
+            file_.write(config)
+    except Exception:
+        log.exception(
+            'Can not write mod_dav_svn configuration to "%s"', filepath)

rhodecode/templates/admin/integrations/base.html

@@ -0,0 +1,40 b''
+## -*- coding: utf-8 -*-
+<%!
+   def inherit(context):
+      if context['c'].repo:
+        return "/admin/repos/repo_edit.html"
+      else:
+        return "/admin/settings/settings.html"
+%>
+<%inherit file="${inherit(context)}" />
+
+<%def name="title()">
+    ${_('Integrations Settings')}
+    %if c.rhodecode_name:
+        &middot; ${h.branding(c.rhodecode_name)}
+    %endif
+</%def>
+
+<%def name="breadcrumbs_links()">
+    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    &raquo;
+    ${_('Integrations')}
+</%def>
+
+<%def name="menu_bar_nav()">
+  %if c.repo:
+    ${self.menu_items(active='repositories')}
+  %else:
+    ${self.menu_items(active='admin')}
+  %endif
+</%def>
+
+<%def name="menu_bar_subnav()">
+  %if c.repo:
+    ${self.repo_menu(active='options')}
+  %endif
+</%def>
+
+<%def name="main_content()">
+  ${next.body()}
+</%def>

rhodecode/templates/admin/integrations/edit.html

@@ -0,0 +1,43 b''
+## -*- coding: utf-8 -*-
+<%inherit file="base.html"/>
+
+<%def name="breadcrumbs_links()">
+  %if c.repo:
+    ${h.link_to('Settings',h.url('edit_repo', repo_name=c.repo.repo_name))}
+    &raquo;
+    ${h.link_to(_('Integrations'),request.route_url(route_name='repo_integrations_home', repo_name=c.repo.repo_name))}
+    &raquo;
+    ${h.link_to(current_IntegrationType.display_name,
+      request.route_url(route_name='repo_integrations_list',
+                        repo_name=c.repo.repo_name,
+                        integration=current_IntegrationType.key))}
+  %else:
+    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    &raquo;
+    ${h.link_to(_('Settings'),h.url('admin_settings'))}
+    &raquo;
+    ${h.link_to(_('Integrations'),request.route_url(route_name='global_integrations_home'))}
+    &raquo;
+    ${h.link_to(current_IntegrationType.display_name,
+      request.route_url(route_name='global_integrations_list',
+                        integration=current_IntegrationType.key))}
+  %endif
+  %if integration:
+    &raquo;
+    ${integration.name}
+  %endif
+</%def>
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h2 class="panel-title">
+      %if integration:
+        ${current_IntegrationType.display_name} - ${integration.name}
+      %else:
+        ${_('Create New %(integration_type)s Integration') % {'integration_type': current_IntegrationType.display_name}}
+      %endif
+    </h2>
+  </div>
+  <div class="panel-body">
+    ${form.render() | n}
+  </div>
+</div>

rhodecode/templates/admin/integrations/list.html

@@ -0,0 +1,147 b''
+## -*- coding: utf-8 -*-
+<%inherit file="base.html"/>
+
+<%def name="breadcrumbs_links()">
+  %if c.repo:
+    ${h.link_to('Settings',h.url('edit_repo', repo_name=c.repo.repo_name))}
+  %else:
+    ${h.link_to(_('Admin'),h.url('admin_home'))}
+    &raquo;
+    ${h.link_to(_('Settings'),h.url('admin_settings'))}
+  %endif
+  %if current_IntegrationType:
+    &raquo;
+    %if c.repo:
+    ${h.link_to(_('Integrations'),
+      request.route_url(route_name='repo_integrations_home',
+                        repo_name=c.repo.repo_name))}
+    %else:
+    ${h.link_to(_('Integrations'),
+      request.route_url(route_name='global_integrations_home'))}
+    %endif
+    &raquo;
+    ${current_IntegrationType.display_name}
+  %else:
+    &raquo;
+    ${_('Integrations')}
+  %endif
+</%def>
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h3 class="panel-title">${_('Create New Integration')}</h3>
+  </div>
+  <div class="panel-body">
+  %if not available_integrations:
+    ${_('No integrations available.')}
+  %else:
+    %for integration in available_integrations:
+      <%
+      if c.repo:
+        create_url = request.route_url('repo_integrations_create',
+                                        repo_name=c.repo.repo_name,
+                                        integration=integration)
+      else:
+        create_url = request.route_url('global_integrations_create',
+                                        integration=integration)
+      %>
+      <a href="${create_url}" class="btn">
+        ${integration}
+      </a>
+    %endfor
+  %endif
+  </div>
+</div>
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h3 class="panel-title">${_('Current Integrations')}</h3>
+  </div>
+  <div class="panel-body">
+    <table class="rctable issuetracker">
+      <thead>
+        <tr>
+            <th>${_('Enabled')}</th>
+            <th>${_('Description')}</th>
+            <th>${_('Type')}</th>
+            <th>${_('Actions')}</th>
+            <th></th>
+        </tr>
+      </thead>
+      <tbody>
+
+  %for integration_type, integrations in sorted(current_integrations.items()):
+    %for integration in sorted(integrations, key=lambda x: x.name):
+        <tr id="integration_${integration.integration_id}">
+          <td class="td-enabled">
+            %if integration.enabled:
+            <div class="flag_status approved pull-left"></div>
+            %else:
+            <div class="flag_status rejected pull-left"></div>
+            %endif
+          </td>
+          <td class="td-description">
+            ${integration.name}
+          </td>
+          <td class="td-regex">
+            ${integration.integration_type}
+          </td>
+          <td class="td-action">
+          %if integration_type not in available_integrations:
+          ${_('unknown integration')}
+          %else:
+            <%
+            if c.repo:
+              edit_url = request.route_url('repo_integrations_edit',
+                                            repo_name=c.repo.repo_name,
+                                            integration=integration.integration_type,
+                                            integration_id=integration.integration_id)
+            else:
+              edit_url = request.route_url('global_integrations_edit',
+                                           integration=integration.integration_type,
+                                           integration_id=integration.integration_id)
+            %>
+            <div class="grid_edit">
+              <a href="${edit_url}">${_('Edit')}</a>
+            </div>
+            <div class="grid_delete">
+              <a href="${edit_url}"
+                 class="btn btn-link btn-danger delete_integration_entry"
+                 data-desc="${integration.name}"
+                 data-uid="${integration.integration_id}">
+                  ${_('Delete')}
+              </a>
+            </div>
+          %endif
+          </td>
+        </tr>
+      %endfor
+    %endfor
+      <tr id="last-row"></tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+<script type="text/javascript">
+  var delete_integration = function(entry) {
+    if (confirm("Confirm to remove this integration: "+$(entry).data('desc'))) {
+      var request = $.ajax({
+        type: "POST",
+        url: $(entry).attr('href'),
+        data: {
+          'delete': 'delete',
+          'csrf_token': CSRF_TOKEN
+        },
+        success: function(){
+          location.reload();
+        },
+        error: function(data, textStatus, errorThrown){
+          alert("Error while deleting entry.\nError code {0} ({1}). URL: {2}".format(data.status,data.statusText,$(entry)[0].url));
+        }
+      });
+    };
+  }
+
+  $('.delete_integration_entry').on('click', function(e){
+    e.preventDefault();
+    delete_integration(this);
+  });
+</script>
  No newline at end of file

rhodecode/templates/base/plugins_base.html

@@ -0,0 +1,14 b''
+<%
+from pyramid.renderers import render as pyramid_render
+from pyramid.threadlocal import get_current_registry, get_current_request
+pyramid_registry = get_current_registry()
+%>
+% for plugin, config in getattr(pyramid_registry, 'rhodecode_plugins', {}).items():
+% if config['template_hooks'].get('plugin_init_template'):
+${pyramid_render(config['template_hooks'].get('plugin_init_template'),
+{'config':config}, request=get_current_request(), package='rc_ae')|n}
+% endif
+% endfor
+<script>
+    $.Topic('/plugins/__REGISTER__').prepareOrPublish({});
+</script>

rhodecode/templates/channelstream/plugin_init.html

@@ -0,0 +1,24 b''
+<script>
+    var CHANNELSTREAM_URLS = ${config['url_gen'](request)|n};
+    %if request.registry.rhodecode_plugins['channelstream']['enabled'] and c.rhodecode_user.username != h.DEFAULT_USER:
+    var CHANNELSTREAM_SETTINGS = {
+        'enabled': true,
+        'ws_location': '${request.registry.settings.get('channelstream.ws_url')}',
+            'webapp_location': '${h.url('/', qualified=True)[:-1]}'
+    };
+    %else:
+    var CHANNELSTREAM_SETTINGS = {
+        'enabled':false,
+        'ws_location': '',
+        'webapp_location': ''};
+    %endif
+
+if (CHANNELSTREAM_SETTINGS.enabled) {
+    connCtrlr = new ConnectionController(
+            CHANNELSTREAM_SETTINGS.webapp_location,
+            CHANNELSTREAM_SETTINGS.ws_location,
+            CHANNELSTREAM_URLS
+    );
+    registerViewChannels();
+}
+</script>

rhodecode/templates/files/files_browser_tree.html

@@ -0,0 +1,78 b''
+<div id="file-tree-wrapper" class="browser-body ${'full-load' if c.full_load else ''}">
+    <table class="code-browser rctable">
+        <thead>
+            <tr>
+                <th>${_('Name')}</th>
+                <th>${_('Size')}</th>
+                <th>${_('Modified')}</th>
+                <th>${_('Last Commit')}</th>
+                <th>${_('Author')}</th>
+            </tr>
+        </thead>
+
+        <tbody id="tbody">
+          %if c.file.parent:
+          <tr class="parity0">
+            <td class="td-componentname">
+              <a href="${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=c.file.parent.path)}" class="pjax-link">
+                <i class="icon-folder"></i>..
+              </a>
+            </td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          %endif
+          %for cnt,node in enumerate(c.file):
+          <tr class="parity${cnt%2}">
+            <td class="td-componentname">
+            %if node.is_submodule():
+              <span class="submodule-dir">
+                ${h.link_to_if(
+                    node.url.startswith('http://') or node.url.startswith('https://'),
+                    node.name, node.url)}
+              </span>
+            %else:
+              <a href="${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=h.safe_unicode(node.path))}" class="pjax-link">
+                <i class="${'icon-file browser-file' if node.is_file() else 'icon-folder browser-dir'}"></i>${node.name}
+              </a>
+            %endif
+            </td>
+            %if node.is_file():
+              <td class="td-size" data-attr-name="size">
+                  % if c.full_load:
+                    <span data-size="${node.size}">${h.format_byte_size_binary(node.size)}</span>
+                  % else:
+                    ${_('Loading ...')}
+                  % endif
+              </td>
+              <td class="td-time" data-attr-name="modified_at">
+                  % if c.full_load:
+                    <span data-date="${node.last_commit.date}">${h.age_component(node.last_commit.date)}</span>
+                  % endif
+              </td>
+              <td class="td-hash" data-attr-name="commit_id">
+                  % if c.full_load:
+                  <div class="tooltip" title="${node.last_commit.message}">
+                      <pre data-commit-id="${node.last_commit.raw_id}">r${node.last_commit.revision}:${node.last_commit.short_id}</pre>
+                  </div>
+                  % endif
+              </td>
+              <td class="td-user" data-attr-name="author">
+                  % if c.full_load:
+                  <span data-author="${node.last_commit.author}" title="${node.last_commit.author}">${h.gravatar_with_user(node.last_commit.author)|n}</span>
+                  % endif
+              </td>
+            %else:
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+            %endif
+          </tr>
+          %endfor
+        </tbody>
+        <tbody id="tbody_filtered"></tbody>
+    </table>
+</div>

rhodecode/templates/forms/checkbox.pt

@@ -0,0 +1,20 b''
+<div class="checkbox">
+  <input tal:define="name name|field.name;
+                       true_val true_val|field.widget.true_val;
+                       css_class css_class|field.widget.css_class;
+                       style style|field.widget.style;
+                       oid oid|field.oid"
+           type="checkbox"
+           name="${name}" value="${true_val}"
+           id="${oid}"
+           tal:attributes="checked cstruct == true_val;
+                           class css_class;
+                           style style;" />
+
+  <label for="${field.oid}">
+    <span tal:condition="hasattr(field, 'schema') and hasattr(field.schema, 'label')"
+          tal:replace="field.schema.label" class="checkbox-label" >
+    </span>
+
+  </label>
+</div>
  No newline at end of file

rhodecode/templates/forms/checkbox_choice.pt

@@ -0,0 +1,25 b''
+<div tal:define="css_class css_class|field.widget.css_class;
+                 style style|field.widget.style;
+                 oid oid|field.oid;
+                 inline getattr(field.widget, 'inline', False)"
+     tal:omit-tag="not inline">
+  ${field.start_sequence()}
+  <div tal:repeat="choice values | field.widget.values"
+       tal:omit-tag="inline"
+       class="checkbox">
+    <div tal:define="(value, title) choice">
+      <input tal:attributes="checked value in cstruct;
+                             class css_class;
+                             style style"
+             type="checkbox"
+             name="checkbox"
+             value="${value}"
+             id="${oid}-${repeat.choice.index}"/>
+      <label for="${oid}-${repeat.choice.index}"
+             tal:attributes="class inline and 'checkbox-inline'">
+        ${title}
+      </label>
+    </div>
+  </div>
+  ${field.end_sequence()}
+</div>
  No newline at end of file

rhodecode/templates/forms/form.pt

@@ -0,0 +1,100 b''
+<form
+  tal:define="style style|field.widget.style;
+              css_class css_class|string:${field.widget.css_class or field.css_class or ''};
+              item_template item_template|field.widget.item_template;
+              autocomplete autocomplete|field.autocomplete;
+              title title|field.title;
+              errormsg errormsg|field.errormsg;
+              description description|field.description;
+              buttons buttons|field.buttons;
+              use_ajax use_ajax|field.use_ajax;
+              ajax_options ajax_options|field.ajax_options;
+              formid formid|field.formid;
+              action action|field.action or None;
+              method method|field.method;"
+  tal:attributes="autocomplete autocomplete;
+                  style style;
+                  class css_class;
+                  action action;"
+  id="${formid}"
+  method="${method}"
+  enctype="multipart/form-data"
+  accept-charset="utf-8"
+  i18n:domain="deform"
+  >
+
+  <fieldset class="deform-form-fieldset">
+
+    <legend tal:condition="title">${title}</legend>
+
+    <input type="hidden" name="${h.csrf_token_key}" value="${h.get_csrf_token()}" />
+    <input type="hidden" name="_charset_" />
+    <input type="hidden" name="__formid__" value="${formid}"/>
+
+    <!--
+    <div class="alert alert-danger" tal:condition="field.error">
+      <div class="error-msg-lbl" i18n:translate=""
+        >There was a problem with your submission</div>
+      <div class="error-msg-detail" i18n:translate=""
+        >Errors have been highlighted below</div>
+      <p class="error-msg">${field.errormsg}</p>
+    </div>
+    -->
+
+    <p class="section first" tal:condition="description">
+      ${description}
+    </p>
+
+    <div tal:repeat="child field"
+         tal:replace="structure child.render_template(item_template)"/>
+
+    <div class="form-group">
+      <tal:loop tal:repeat="button buttons">
+        <button
+              tal:define="btn_disposition repeat.button.start and 'btn-primary' or (button.name == 'delete' and 'btn-danger' or 'btn-default');
+              btn_icon button.icon|None"
+              tal:attributes="disabled button.disabled if button.disabled else None"
+              id="${formid+button.name}"
+              name="${button.name}"
+              type="${button.type}"
+              class="btn ${button.css_class or btn_disposition}"
+              value="${button.value}">
+          <i tal:condition="btn_icon" class="${btn_icon}"> </i>
+          ${button.title}
+        </button>
+      </tal:loop>
+    </div>
+
+  </fieldset>
+
+  <script type="text/javascript" tal:condition="use_ajax">
+   deform.addCallback(
+     '${formid}',
+     function(oid) {
+       var target = '#' + oid;
+       var options = {
+         target: target,
+         replaceTarget: true,
+         success: function() {
+           deform.processCallbacks();
+           deform.focusFirstInput(target);
+         },
+         beforeSerialize: function() {
+           // See http://bit.ly/1agBs9Z (hack to fix tinymce-related ajax bug)
+           if ('tinymce' in window) {
+             $(tinymce.get()).each(
+               function(i, el) {
+                 var content = el.getContent();
+                 var editor_input = document.getElementById(el.id);
+                 editor_input.value = content;
+             });
+           }
+         }
+       };
+       var extra_options = ${ajax_options} || {};
+       $('#' + oid).ajaxForm($.extend(options, extra_options));
+     }
+   );
+  </script>
+
+</form>
  No newline at end of file

rhodecode/templates/forms/mapping.pt

@@ -0,0 +1,33 b''
+<tal:def tal:define="title title|field.title;
+                     description description|field.description;
+                     errormsg errormsg|field.errormsg;
+                     item_template item_template|field.widget.item_template"
+         i18n:domain="deform">
+
+  <div class="panel panel-default">
+    <div class="panel-heading">${title}</div>
+    <div class="panel-body">
+
+      <div tal:condition="errormsg"
+           class="clearfix alert alert-danger">
+        <p i18n:translate="">
+           There was a problem with this section
+        </p>
+        <p>${errormsg}</p>
+      </div>
+
+      <div tal:condition="description">
+        ${description}
+      </div>
+
+      ${field.start_mapping()}
+      <div tal:repeat="child field.children"
+           tal:replace="structure child.render_template(item_template)" >
+      </div>
+      ${field.end_mapping()}
+
+      <div style="clear: both"></div>
+    </div>
+  </div>
+
+</tal:def>
  No newline at end of file

rhodecode/templates/forms/mapping_item.pt

@@ -0,0 +1,47 b''
+<div tal:define="error_class error_class|field.widget.error_class;
+                 description description|field.description;
+                 title title|field.title;
+                 oid oid|field.oid;
+                 hidden hidden|field.widget.hidden;
+                 category category|field.widget.category;
+                 structural hidden or category == 'structural';
+                 required required|field.required;"
+     class="form-group ${field.error and 'has-error' or ''} ${field.widget.item_css_class or ''}"
+     id="item-${oid}"
+     tal:omit-tag="structural"
+     i18n:domain="deform">
+
+  <label for="${oid}"
+         class="control-label ${required and 'required' or ''}"
+         tal:condition="not structural"
+         id="req-${oid}"
+         >
+    ${title}
+  </label>
+  <div class="control-inputs">
+    <div tal:define="input_prepend field.widget.input_prepend | None;
+                     input_append field.widget.input_append  | None"
+         tal:omit-tag="not (input_prepend or input_append)"
+         class="input-group">
+      <span class="input-group-addon"
+            tal:condition="input_prepend">${input_prepend}</span
+      ><span tal:replace="structure field.serialize(cstruct).strip()"
+      /><span class="input-group-addon"
+              tal:condition="input_append">${input_append}</span>
+    </div>
+    <p class="help-block error-block"
+       tal:define="errstr 'error-%s' % field.oid"
+       tal:repeat="msg field.error.messages()"
+       i18n:translate=""
+       tal:attributes="id repeat.msg.index==0 and errstr or
+       ('%s-%s' % (errstr, repeat.msg.index))"
+       tal:condition="field.error and not field.widget.hidden and not field.typ.__class__.__name__=='Mapping'">
+      ${msg}
+    </p>
+
+    <p tal:condition="field.description and not field.widget.hidden"
+       class="help-block" >
+      ${field.description}
+    </p>
+  </div>
+</div>
  No newline at end of file

rhodecode/templates/forms/readonly/sequence.pt

@@ -0,0 +1,24 b''
+<div tal:define="
+     item_tmpl item_template|field.widget.readonly_item_template;
+     oid oid|field.oid;
+     name name|field.name;
+     title title|field.title;"
+     class="deform-seq"
+     id="${oid}">
+
+  <div class="panel panel-default">
+    <div class="panel-heading">${title}</div>
+    <div class="panel-body">
+
+      <div class="deform-seq-container">
+        <div tal:define="subfields [ x[1] for x in subfields ]"
+             tal:repeat="subfield subfields"
+             tal:replace="structure subfield.render_template(item_tmpl,
+                                                          parent=field)" />
+      </div>
+
+      <div style="clear: both"></div>
+    </div>
+
+  </div>
+</div>
  No newline at end of file

rhodecode/templates/forms/readonly/sequence_item.pt

@@ -0,0 +1,11 b''
+<div tal:omit-tag="field.widget.hidden"
+     tal:define="
+     hidden hidden|field.widget.hidden;
+     description description|field.description;"
+     title="${description}"
+     class="form-group row deform-seq-item ${field.error and error_class or ''} ${field.widget.item_css_class or ''}"
+     i18n:domain="deform">
+  <div class="deform-seq-item-group">
+    <span tal:replace="structure field.serialize(cstruct, readonly=True)"/>
+  </div>
+</div>

rhodecode/templates/forms/select2.pt

@@ -0,0 +1,55 b''
+<div tal:define="
+     name name|field.name;
+     style field.widget.style;
+     oid oid|field.oid;
+     css_class css_class|field.widget.css_class;
+     optgroup_class optgroup_class|field.widget.optgroup_class;
+     multiple multiple|field.widget.multiple;"
+     tal:omit-tag="">
+  <input type="hidden" name="__start__" value="${name}:sequence"
+         tal:condition="multiple" />
+
+  <select tal:attributes="
+          name name;
+          id oid;
+          class string: form-control ${css_class or ''};
+          data-placeholder field.widget.placeholder|None;
+          multiple multiple;
+          style style;">
+    <tal:loop tal:repeat="item values">
+      <optgroup tal:condition="isinstance(item, optgroup_class)"
+                tal:attributes="label item.label">
+        <option tal:repeat="(value, description) item.options"
+                tal:attributes="
+                selected (multiple and value in list(map(unicode, cstruct)) or value == list(map(unicode, cstruct))) and 'selected';
+                class css_class;
+                label field.widget.long_label_generator and description;
+                value value"
+                tal:content="field.widget.long_label_generator and field.widget.long_label_generator(item.label, description) or description"/>
+      </optgroup>
+      <option tal:condition="not isinstance(item, optgroup_class)"
+              tal:attributes="
+              selected (multiple and item[0] in list(map(unicode, cstruct)) or item[0] == unicode(cstruct)) and 'selected';
+              class css_class;
+              value item[0]">${item[1]}</option>
+    </tal:loop>
+  </select>
+
+  <script type="text/javascript">
+   deform.addCallback(
+     '${field.oid}',
+     function(oid) {
+       $('#' + oid).select2({
+         containerCssClass: 'form-control drop-menu',
+         dropdownCssClass: 'drop-menu-dropdown',
+         dropdownAutoWidth: true,
+         placeholder: "${str(field.widget.placeholder).replace('"','\\"')|""}",
+         allowClear: true
+       });
+     }
+   );
+  </script>
+
+  <input type="hidden" name="__end__" value="${name}:sequence"
+         tal:condition="multiple" />
+</div>
  No newline at end of file

rhodecode/templates/forms/sequence.pt

@@ -0,0 +1,105 b''
+<div tal:define="item_tmpl item_template|field.widget.item_template;
+                 oid oid|field.oid;
+                 name name|field.name;
+                 min_len min_len|field.widget.min_len;
+                 min_len min_len or 0;
+                 max_len max_len|field.widget.max_len;
+                 max_len max_len or 100000;
+                 now_len len(subfields);
+                 orderable orderable|field.widget.orderable;
+                 orderable orderable and 1 or 0;
+                 prototype field.widget.prototype(field);
+                 title title|field.title;"
+     class="deform-seq"
+     id="${oid}">
+
+  <style>
+    body.dragging, body.dragging * {
+      cursor: move !important;
+    }
+
+    .dragged {
+      position: absolute;
+      opacity: 0.5;
+      z-index: 2000;
+    }
+  </style>
+
+  <!-- sequence -->
+  <input type="hidden" name="__start__"
+         value="${field.name}:sequence"
+         class="deform-proto"
+         tal:attributes="prototype prototype"/>
+
+  <div class="panel panel-default">
+    <div class="panel-heading">${title}</div>
+    <div class="panel-body">
+
+      <div class="deform-seq-container"
+           id="${oid}-orderable">
+        <div tal:define="subfields [ x[1] for x in subfields ]"
+             tal:repeat="subfield subfields"
+             tal:replace="structure subfield.render_template(item_tmpl,
+                                                          parent=field)" />
+        <span class="deform-insert-before"
+              tal:attributes="
+                 min_len min_len;
+                 max_len max_len;
+                 now_len now_len;
+                 orderable orderable;"></span>
+      </div>
+
+      <div style="clear: both"></div>
+    </div>
+
+    <div class="panel-footer">
+      <a href="#"
+         class="btn deform-seq-add"
+         id="${field.oid}-seqAdd"
+         onclick="javascript: return deform.appendSequenceItem(this);">
+        <small id="${field.oid}-addtext">${add_subitem_text}</small>
+      </a>
+
+      <script type="text/javascript">
+       deform.addCallback(
+         '${field.oid}',
+         function(oid) {
+           oid_node = $('#'+ oid);
+           deform.processSequenceButtons(oid_node, ${min_len},
+                                         ${max_len}, ${now_len},
+                                         ${orderable});
+           }
+         )
+         <tal:block condition="orderable">
+             $( "#${oid}-orderable" ).sortable({
+               handle: ".deform-order-button, .panel-heading",
+               containerSelector: "#${oid}-orderable",
+               itemSelector: ".deform-seq-item",
+               placeholder: '<span class="glyphicon glyphicon-arrow-right placeholder"></span>',
+               onDragStart: function ($item, container, _super) {
+                 var offset = $item.offset(),
+                 pointer = container.rootGroup.pointer
+
+                 adjustment = {
+                   left: pointer.left - offset.left,
+                   top: pointer.top - offset.top
+                 }
+
+                 _super($item, container)
+               },
+               onDrag: function ($item, position) {
+                   $item.css({
+                     left: position.left - adjustment.left,
+                     top: position.top - adjustment.top
+                   })
+                 }
+               });
+         </tal:block>
+      </script>
+
+      <input type="hidden" name="__end__" value="${field.name}:sequence"/>
+      <!-- /sequence -->
+    </div>
+
+  </div>
+</div>
  No newline at end of file

rhodecode/templates/forms/sequence_item.pt

@@ -0,0 +1,35 b''
+<div tal:omit-tag="field.widget.hidden"
+     tal:define="hidden hidden|field.widget.hidden;
+                 error_class error_class|field.widget.error_class;
+                 description description|field.description;
+                 title title|field.title;
+                 oid oid|field.oid"
+     class="form-group row deform-seq-item ${field.error and error_class or ''} ${field.widget.item_css_class or ''}"
+     i18n:domain="deform">
+  <div class="deform-seq-item-group">
+    <span tal:replace="structure field.serialize(cstruct)"/>
+    <tal:errors condition="field.error and not hidden"
+                define="errstr 'error-%s' % oid"
+                repeat="msg field.error.messages()">
+      <p tal:condition="msg"
+         id="${errstr if repeat.msg.index==0 else '%s-%s' % (errstr, repeat.msg.index)}"
+         class="${error_class} help-block error-block"
+         i18n:translate="">${msg}</p>
+    </tal:errors>
+  </div>
+  <div class="deform-seq-item-handle" style="padding:0">
+    <!-- sequence_item -->
+    <span class="deform-order-button close glyphicon glyphicon-resize-vertical"
+          id="${oid}-order"
+          tal:condition="not hidden"
+          title="Reorder (via drag and drop)"
+          i18n:attributes="title"></span>
+    <a class="deform-close-button close"
+       id="${oid}-close"
+       tal:condition="not field.widget.hidden"
+       title="Remove"
+       i18n:attributes="title"
+       onclick="javascript:deform.removeSequenceItem(this);">&times;</a>
+  </div>
+  <!-- /sequence_item -->
+</div>

rhodecode/templates/forms/textinput.pt

@@ -0,0 +1,23 b''
+<span tal:define="name name|field.name;
+                  css_class css_class|field.widget.css_class;
+                  oid oid|field.oid;
+                  mask mask|field.widget.mask;
+                  placeholder placeholder|field.widget.placeholder|field.placeholder|'';
+                  mask_placeholder mask_placeholder|field.widget.mask_placeholder;
+                  style style|field.widget.style;
+"
+      tal:omit-tag="">
+    <input type="text" name="${name}" value="${cstruct}"
+           tal:attributes="class string: form-control ${css_class or ''};
+                           style style"
+            placeholder="${placeholder}"
+           id="${oid}"/>
+    <script tal:condition="mask" type="text/javascript">
+      deform.addCallback(
+         '${oid}',
+         function (oid) {
+            $("#" + oid).mask("${mask}",
+                 {placeholder:"${mask_placeholder}"});
+         });
+    </script>
+</span>
  No newline at end of file

rhodecode/tests/config/test_sanitize_settings.py

@@ -0,0 +1,202 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+import pytest
+
+from rhodecode.config.middleware import (
+    _sanitize_vcs_settings, _bool_setting, _string_setting, _list_setting,
+    _int_setting)
+
+
+class TestHelperFunctions(object):
+    @pytest.mark.parametrize('raw, expected', [
+        ('true', True), (u'true', True),
+        ('yes', True), (u'yes', True),
+        ('on', True), (u'on', True),
+        ('false', False), (u'false', False),
+        ('no', False), (u'no', False),
+        ('off', False), (u'off', False),
+        ('invalid-bool-value', False),
+        ('invalid-∫øø@-√å@¨€', False),
+        (u'invalid-∫øø@-√å@¨€', False),
+    ])
+    def test_bool_setting_helper(self, raw, expected):
+        key = 'dummy-key'
+        settings = {key: raw}
+        _bool_setting(settings, key, None)
+        assert settings[key] is expected
+
+    @pytest.mark.parametrize('raw, expected', [
+        ('', ''),
+        ('test-string', 'test-string'),
+        ('CaSe-TeSt', 'case-test'),
+        ('test-string-烩€', 'test-string-烩€'),
+        (u'test-string-烩€', u'test-string-烩€'),
+    ])
+    def test_string_setting_helper(self, raw, expected):
+        key = 'dummy-key'
+        settings = {key: raw}
+        _string_setting(settings, key, None)
+        assert settings[key] == expected
+
+    @pytest.mark.parametrize('raw, expected', [
+        ('', []),
+        ('test', ['test']),
+        ('CaSe-TeSt', ['CaSe-TeSt']),
+        ('test-string-烩€', ['test-string-烩€']),
+        (u'test-string-烩€', [u'test-string-烩€']),
+        ('hg git svn', ['hg', 'git', 'svn']),
+        ('hg,git,svn', ['hg', 'git', 'svn']),
+        ('hg, git, svn', ['hg', 'git', 'svn']),
+        ('hg\ngit\nsvn', ['hg', 'git', 'svn']),
+        (' hg\n git\n svn ', ['hg', 'git', 'svn']),
+        (', hg , git , svn , ', ['', 'hg', 'git', 'svn', '']),
+        ('cheese,free node,other', ['cheese', 'free node', 'other']),
+    ])
+    def test_list_setting_helper(self, raw, expected):
+        key = 'dummy-key'
+        settings = {key: raw}
+        _list_setting(settings, key, None)
+        assert settings[key] == expected
+
+    @pytest.mark.parametrize('raw, expected', [
+        ('0', 0),
+        ('-0', 0),
+        ('12345', 12345),
+        ('-12345', -12345),
+        (u'-12345', -12345),
+    ])
+    def test_int_setting_helper(self, raw, expected):
+        key = 'dummy-key'
+        settings = {key: raw}
+        _int_setting(settings, key, None)
+        assert settings[key] == expected
+
+    @pytest.mark.parametrize('raw', [
+        ('0xff'),
+        (''),
+        ('invalid-int'),
+        ('invalid-⁄~†'),
+        (u'invalid-⁄~†'),
+    ])
+    def test_int_setting_helper_invalid_input(self, raw):
+        key = 'dummy-key'
+        settings = {key: raw}
+        with pytest.raises(Exception):
+            _int_setting(settings, key, None)
+
+
+class TestSanitizeVcsSettings(object):
+    _bool_settings = [
+        ('vcs.hooks.direct_calls', False),
+        ('vcs.server.enable', True),
+        ('vcs.start_server', False),
+        ('startup.import_repos', False),
+    ]
+
+    _string_settings = [
+        ('vcs.svn.compatible_version', ''),
+        ('git_rev_filter', '--all'),
+        ('vcs.hooks.protocol', 'pyro4'),
+        ('vcs.server', ''),
+        ('vcs.server.log_level', 'debug'),
+        ('vcs.server.protocol', 'pyro4'),
+    ]
+
+    _list_settings = [
+        ('vcs.backends', 'hg git'),
+    ]
+
+    @pytest.mark.parametrize('key, default', _list_settings)
+    def test_list_setting_spacesep_list(self, key, default):
+        test_list = ['test', 'list', 'values', 'for', key]
+        input_value = ' '.join(test_list)
+        settings = {key: input_value}
+        _sanitize_vcs_settings(settings)
+        assert settings[key] == test_list
+
+    @pytest.mark.parametrize('key, default', _list_settings)
+    def test_list_setting_newlinesep_list(self, key, default):
+        test_list = ['test', 'list', 'values', 'for', key]
+        input_value = '\n'.join(test_list)
+        settings = {key: input_value}
+        _sanitize_vcs_settings(settings)
+        assert settings[key] == test_list
+
+    @pytest.mark.parametrize('key, default', _list_settings)
+    def test_list_setting_commasep_list(self, key, default):
+        test_list = ['test', 'list', 'values', 'for', key]
+        input_value = ','.join(test_list)
+        settings = {key: input_value}
+        _sanitize_vcs_settings(settings)
+        assert settings[key] == test_list
+
+    @pytest.mark.parametrize('key, default', _list_settings)
+    def test_list_setting_comma_and_space_sep_list(self, key, default):
+        test_list = ['test', 'list', 'values', 'for', key]
+        input_value = ', '.join(test_list)
+        settings = {key: input_value}
+        _sanitize_vcs_settings(settings)
+        assert settings[key] == test_list
+
+    @pytest.mark.parametrize('key, default', _string_settings)
+    def test_string_setting_string(self, key, default):
+        test_value = 'test-string-for-{}'.format(key)
+        settings = {key: test_value}
+        _sanitize_vcs_settings(settings)
+        assert settings[key] == test_value
+
+    @pytest.mark.parametrize('key, default', _string_settings)
+    def test_string_setting_default(self, key, default):
+        settings = {}
+        _sanitize_vcs_settings(settings)
+        assert settings[key] == default
+
+    @pytest.mark.parametrize('key, default', _string_settings)
+    def test_string_setting_lowercase(self, key, default):
+        test_value = 'Test-String-For-{}'.format(key)
+        settings = {key: test_value}
+        _sanitize_vcs_settings(settings)
+        assert settings[key] == test_value.lower()
+
+    @pytest.mark.parametrize('key, default', _bool_settings)
+    def test_bool_setting_true(self, key, default):
+        settings = {key: 'true'}
+        _sanitize_vcs_settings(settings)
+        assert settings[key] is True
+
+    @pytest.mark.parametrize('key, default', _bool_settings)
+    def test_bool_setting_false(self, key, default):
+        settings = {key: 'false'}
+        _sanitize_vcs_settings(settings)
+        assert settings[key] is False
+
+    @pytest.mark.parametrize('key, default', _bool_settings)
+    def test_bool_setting_invalid_string(self, key, default):
+        settings = {key: 'no-bool-val-string'}
+        _sanitize_vcs_settings(settings)
+        assert settings[key] is False
+
+    @pytest.mark.parametrize('key, default', _bool_settings)
+    def test_bool_setting_default(self, key, default):
+        settings = {}
+        _sanitize_vcs_settings(settings)
+        assert settings[key] is default

rhodecode/tests/events/__init__.py

@@ -0,0 +1,19 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/

rhodecode/tests/events/conftest.py

@@ -0,0 +1,41 b''
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import mock
+import decorator
+
+
+class EventCatcher(object):
+    """ Testing context manager to check if events are fired """
+
+    def __init__(self):
+        self.events = [] # the actual events captured
+        self.events_types = [] # the types of events captured
+
+    def __enter__(self):
+        self.event_trigger_patch = mock.patch('rhodecode.events.trigger')
+        self.mocked_event_trigger = self.event_trigger_patch.start()
+        return self
+
+    def __exit__(self, type_, value, traceback):
+        self.event_trigger_patch.stop()
+
+        for call in self.mocked_event_trigger.call_args_list:
+            event = call[0][0]
+            self.events.append(event)
+            self.events_types.append(type(event))

rhodecode/tests/events/test_pullrequest.py

@@ -0,0 +1,93 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import pytest
+
+from rhodecode.tests.events.conftest import EventCatcher
+
+from rhodecode.model.comment import ChangesetCommentsModel
+from rhodecode.model.pull_request import PullRequestModel
+from rhodecode.events import (
+    PullRequestCreateEvent,
+    PullRequestUpdateEvent,
+    PullRequestCommentEvent,
+    PullRequestReviewEvent,
+    PullRequestMergeEvent,
+    PullRequestCloseEvent,
+)
+
+# TODO: dan: make the serialization tests complete json comparisons
[e-mail]("git", "hg")
[e-mail]('EventClass', [
+    PullRequestCreateEvent,
+    PullRequestUpdateEvent,
+    PullRequestReviewEvent,
+    PullRequestMergeEvent,
+    PullRequestCloseEvent,
+])
+def test_pullrequest_events_serialized(pr_util, EventClass):
+    pr = pr_util.create_pull_request()
+    event = EventClass(pr)
+    data = event.as_dict()
+    assert data['name'] == EventClass.name
+    assert data['repo']['repo_name'] == pr.target_repo.repo_name
+    assert data['pullrequest']['pull_request_id'] == pr.pull_request_id
+    assert data['pullrequest']['url']
+
[e-mail]("git", "hg")
+def test_create_pull_request_events(pr_util):
+    with EventCatcher() as event_catcher:
+        pr_util.create_pull_request()
+
+    assert PullRequestCreateEvent in event_catcher.events_types
+
[e-mail]("git", "hg")
+def test_pullrequest_comment_events_serialized(pr_util):
+    pr = pr_util.create_pull_request()
+    comment = ChangesetCommentsModel().get_comments(
+        pr.target_repo.repo_id, pull_request=pr)[0]
+    event = PullRequestCommentEvent(pr, comment)
+    data = event.as_dict()
+    assert data['name'] == PullRequestCommentEvent.name
+    assert data['repo']['repo_name'] == pr.target_repo.repo_name
+    assert data['pullrequest']['pull_request_id'] == pr.pull_request_id
+    assert data['pullrequest']['url']
+    assert data['comment']['text'] == comment.text
+
+
[e-mail]("git", "hg")
+def test_close_pull_request_events(pr_util, user_admin):
+    pr = pr_util.create_pull_request()
+
+    with EventCatcher() as event_catcher:
+        PullRequestModel().close_pull_request(pr, user_admin)
+
+    assert PullRequestCloseEvent in event_catcher.events_types
+
+
[e-mail]("git", "hg")
+def test_close_pull_request_with_comment_events(pr_util, user_admin):
+    pr = pr_util.create_pull_request()
+
+    with EventCatcher() as event_catcher:
+        PullRequestModel().close_pull_request_with_comment(
+            pr, user_admin, pr.target_repo)
+
+    assert PullRequestCloseEvent in event_catcher.events_types

rhodecode/tests/events/test_repo.py

@@ -0,0 +1,116 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import pytest
+
+from rhodecode.tests.events.conftest import EventCatcher
+
+from rhodecode.lib import hooks_base, utils2
+from rhodecode.model.repo import RepoModel
+from rhodecode.events.repo import (
+    RepoPrePullEvent, RepoPullEvent,
+    RepoPrePushEvent, RepoPushEvent,
+    RepoPreCreateEvent, RepoCreateEvent,
+    RepoPreDeleteEvent, RepoDeleteEvent,
+)
+
+
[e-mail]
+def scm_extras(user_regular, repo_stub):
+    extras = utils2.AttributeDict({
+        'ip': '127.0.0.1',
+        'username': user_regular.username,
+        'action': '',
+        'repository': repo_stub.repo_name,
+        'scm': repo_stub.scm_instance().alias,
+        'config': '',
+        'server_url': 'http://example.com',
+        'make_lock': None,
+        'locked_by': [None],
+        'commit_ids': ['a' * 40] * 3,
+    })
+    return extras
+
+
+# TODO: dan: make the serialization tests complete json comparisons
[e-mail]('EventClass', [
+    RepoPreCreateEvent, RepoCreateEvent,
+    RepoPreDeleteEvent, RepoDeleteEvent,
+])
+def test_repo_events_serialized(repo_stub, EventClass):
+    event = EventClass(repo_stub)
+    data = event.as_dict()
+    assert data['name'] == EventClass.name
+    assert data['repo']['repo_name'] == repo_stub.repo_name
+    assert data['repo']['url']
+
+
[e-mail]('EventClass', [
+    RepoPrePullEvent, RepoPullEvent, RepoPrePushEvent
+])
+def test_vcs_repo_events_serialize(repo_stub, scm_extras, EventClass):
+    event = EventClass(repo_name=repo_stub.repo_name, extras=scm_extras)
+    data = event.as_dict()
+    assert data['name'] == EventClass.name
+    assert data['repo']['repo_name'] == repo_stub.repo_name
+    assert data['repo']['url']
+
+
+
[e-mail]('EventClass', [RepoPushEvent])
+def test_vcs_repo_push_event_serialize(repo_stub, scm_extras, EventClass):
+    event = EventClass(repo_name=repo_stub.repo_name,
+                       pushed_commit_ids=scm_extras['commit_ids'],
+                       extras=scm_extras)
+    data = event.as_dict()
+    assert data['name'] == EventClass.name
+    assert data['repo']['repo_name'] == repo_stub.repo_name
+    assert data['repo']['url']
+
+
+def test_create_delete_repo_fires_events(backend):
+    with EventCatcher() as event_catcher:
+        repo = backend.create_repo()
+    assert event_catcher.events_types == [RepoPreCreateEvent, RepoCreateEvent]
+
+    with EventCatcher() as event_catcher:
+        RepoModel().delete(repo)
+    assert event_catcher.events_types == [RepoPreDeleteEvent, RepoDeleteEvent]
+
+
+def test_pull_fires_events(scm_extras):
+    with EventCatcher() as event_catcher:
+        hooks_base.pre_push(scm_extras)
+    assert event_catcher.events_types == [RepoPrePushEvent]
+
+    with EventCatcher() as event_catcher:
+        hooks_base.post_push(scm_extras)
+    assert event_catcher.events_types == [RepoPushEvent]
+
+
+def test_push_fires_events(scm_extras):
+    with EventCatcher() as event_catcher:
+        hooks_base.pre_pull(scm_extras)
+    assert event_catcher.events_types == [RepoPrePullEvent]
+
+    with EventCatcher() as event_catcher:
+        hooks_base.post_pull(scm_extras)
+    assert event_catcher.events_types == [RepoPullEvent]
+

rhodecode/tests/integrations/test_integration.py

@@ -0,0 +1,78 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import pytest
+import requests
+from mock import Mock, patch
+
+from rhodecode import events
+from rhodecode.model.db import Session, Integration
+from rhodecode.model.integration import IntegrationModel
+from rhodecode.integrations.types.base import IntegrationTypeBase
+
+
+class TestIntegrationType(IntegrationTypeBase):
+    """ Test integration type class """
+
+    key = 'test-integration'
+    display_name = 'Test integration type'
+
+    def __init__(self, settings):
+        super(IntegrationTypeBase, self).__init__(settings)
+        self.sent_events = [] # for testing
+
+    def send_event(self, event):
+        self.sent_events.append(event)
+
+
[e-mail]
+def repo_integration_stub(request, repo_stub):
+    settings = {'test_key': 'test_value'}
+    integration = IntegrationModel().create(
+        TestIntegrationType, settings=settings, repo=repo_stub, enabled=True,
+        name='test repo integration')
+
+    @request.addfinalizer
+    def cleanup():
+        IntegrationModel().delete(integration)
+
+    return integration
+
+
[e-mail]
+def global_integration_stub(request):
+    settings = {'test_key': 'test_value'}
+    integration = IntegrationModel().create(
+        TestIntegrationType, settings=settings, enabled=True,
+        name='test global integration')
+
+    @request.addfinalizer
+    def cleanup():
+        IntegrationModel().delete(integration)
+
+    return integration
+
+
+def test_delete_repo_with_integration_deletes_integration(repo_integration_stub):
+    Session().delete(repo_integration_stub.repo)
+    Session().commit()
+    Session().expire_all()
+    assert Integration.get(repo_integration_stub.integration_id) is None
+

rhodecode/tests/integrations/test_slack.py

@@ -0,0 +1,95 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import pytest
+import requests
+from mock import Mock, patch
+
+from rhodecode import events
+from rhodecode.model.db import Session, Integration
+from rhodecode.integrations.types.slack import SlackIntegrationType
+
[e-mail]
+def repo_push_event(backend, user_regular):
+    commits = [
+        {'message': 'ancestor commit fixes #15'},
+        {'message': 'quick fixes'},
+        {'message': 'change that fixes #41, #2'},
+        {'message': 'this is because 5b23c3532 broke stuff'},
+        {'message': 'last commit'},
+    ]
+    commit_ids = backend.create_master_repo(commits).values()
+    repo = backend.create_repo()
+    scm_extras = {
+        'ip': '127.0.0.1',
+        'username': user_regular.username,
+        'action': '',
+        'repository': repo.repo_name,
+        'scm': repo.scm_instance().alias,
+        'config': '',
+        'server_url': 'http://example.com',
+        'make_lock': None,
+        'locked_by': [None],
+        'commit_ids': commit_ids,
+    }
+
+    return events.RepoPushEvent(repo_name=repo.repo_name,
+                                pushed_commit_ids=commit_ids,
+                                extras=scm_extras)
+
+
[e-mail]
+def slack_settings():
+    return {
+        "service": "mock://slackintegration",
+        "events": [
+           "pullrequest-create",
+           "repo-push",
+        ],
+        "channel": "#testing",
+        "icon_emoji": ":recycle:",
+        "username": "rhodecode-test"
+    }
+
+
[e-mail]
+def slack_integration(request, app, slack_settings):
+    integration = Integration()
+    integration.name = 'test slack integration'
+    integration.enabled = True
+    integration.integration_type = SlackIntegrationType.key
+    integration.settings = slack_settings
+    Session().add(integration)
+    Session().commit()
+    request.addfinalizer(lambda: Session().delete(integration))
+    return integration
+
+
+def test_slack_push(slack_integration, repo_push_event):
+    with patch('rhodecode.integrations.types.slack.post_text_to_slack') as call:
+        events.trigger(repo_push_event)
+    assert 'pushed to' in call.call_args[0][1]
+
+    slack_integration.settings['events'] = []
+    Session().commit()
+
+    with patch('rhodecode.integrations.types.slack.post_text_to_slack') as call:
+        events.trigger(repo_push_event)
+    assert not call.call_args

rhodecode/tests/lib/test_jsonalchemy.py

@@ -0,0 +1,45 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import pickle
+import pytest
+
+from rhodecode.lib.jsonalchemy import MutationDict, MutationList
+
+
+def test_mutation_dict_is_picklable():
+    mutation_dict = MutationDict({'key1': 'value1', 'key2': 'value2'})
+    dumped = pickle.dumps(mutation_dict)
+    loaded = pickle.loads(dumped)
+    assert loaded == mutation_dict
+
+def test_mutation_list_is_picklable():
+    mutation_list = MutationList(['a', 'b', 'c'])
+    dumped = pickle.dumps(mutation_list)
+    loaded = pickle.loads(dumped)
+    assert loaded == mutation_list
+
+def test_mutation_dict_with_lists_is_picklable():
+    mutation_dict = MutationDict({
+        'key': MutationList(['values', MutationDict({'key': 'value'})])
+    })
+    dumped = pickle.dumps(mutation_dict)
+    loaded = pickle.loads(dumped)
+    assert loaded == mutation_dict

rhodecode/tests/models/schemas/test_gist_schema.py

@@ -0,0 +1,100 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import colander
+import pytest
+
+from rhodecode.model import validation_schema
+from rhodecode.model.validation_schema.schemas import gist_schema
+
+
+class TestGistSchema(object):
+
+    def test_deserialize_bad_data(self):
+        schema = gist_schema.GistSchema().bind(
+            lifetime_options=[1, 2, 3]
+        )
+        with pytest.raises(validation_schema.Invalid) as exc_info:
+            schema.deserialize('err')
+        err = exc_info.value.asdict()
+        assert err[''] == '"err" is not a mapping type: ' \
+                          'Does not implement dict-like functionality.'
+
+    def test_deserialize_bad_lifetime_options(self):
+        schema = gist_schema.GistSchema().bind(
+            lifetime_options=[1, 2, 3]
+        )
+        with pytest.raises(validation_schema.Invalid) as exc_info:
+            schema.deserialize(dict(
+                lifetime=10
+            ))
+        err = exc_info.value.asdict()
+        assert err['lifetime'] == '"10" is not one of 1, 2, 3'
+
+        with pytest.raises(validation_schema.Invalid) as exc_info:
+            schema.deserialize(dict(
+                lifetime='x'
+            ))
+        err = exc_info.value.asdict()
+        assert err['lifetime'] == '"x" is not a number'
+
+    def test_serialize_data_correctly(self):
+        schema = gist_schema.GistSchema().bind(
+            lifetime_options=[1, 2, 3]
+        )
+        nodes = [{
+            'filename': 'foobar',
+            'filename_org': 'foobar',
+            'content': 'content',
+            'mimetype': 'xx'
+        }]
+        schema_data = schema.deserialize(dict(
+            lifetime=2,
+            gist_type='public',
+            gist_acl_level='acl_public',
+            nodes=nodes,
+        ))
+
+        assert schema_data['nodes'] == nodes
+
+    def test_serialize_data_correctly_with_conversion(self):
+        schema = gist_schema.GistSchema().bind(
+            lifetime_options=[1, 2, 3],
+            convert_nodes=True
+        )
+        nodes = [{
+            'filename': 'foobar',
+            'filename_org': None,
+            'content': 'content',
+            'mimetype': 'xx'
+        }]
+        schema_data = schema.deserialize(dict(
+            lifetime=2,
+            gist_type='public',
+            gist_acl_level='acl_public',
+            nodes=nodes,
+        ))
+
+        assert schema_data['nodes'] == nodes
+
+        seq_nodes = gist_schema.sequence_to_nodes(nodes)
+        assert isinstance(seq_nodes, dict)
+        seq_nodes = gist_schema.nodes_to_sequence(seq_nodes)
+        assert nodes == seq_nodes

rhodecode/tests/vcs/test_hg_vcsserver_cache_invalidation.py

@@ -0,0 +1,189 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2016  RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import pytest
+
+from mock import call, patch
+
+from rhodecode.lib.vcs.backends.base import Reference
+
+
+class TestMercurialRemoteRepoInvalidation(object):
+    """
+    If the VCSServer is running with multiple processes or/and instances.
+    Operations on repositories are potentially handled by different processes
+    in a random fashion. The mercurial repository objects used in the VCSServer
+    are caching the commits of the repo. Therefore we have to invalidate the
+    VCSServer caching of these objects after a writing operation.
+    """
+
+    # Default reference used as a dummy during tests.
+    default_ref = Reference('branch', 'default', None)
+
+    # Methods of vcsserver.hg.HgRemote that are "writing" operations.
+    writing_methods = [
+        'bookmark',
+        'commit',
+        'merge',
+        'pull',
+        'pull_cmd',
+        'rebase',
+        'strip',
+        'tag',
+    ]
+
+    @pytest.mark.parametrize('method_name, method_args', [
+        ('_local_merge', [default_ref, None, None, None, default_ref]),
+        ('_local_pull', ['', default_ref]),
+        ('bookmark', [None]),
+        ('pull', ['', default_ref]),
+        ('remove_tag', ['mytag', None]),
+        ('strip', [None]),
+        ('tag', ['newtag', None]),
+    ])
+    def test_method_invokes_invalidate_on_remote_repo(
+            self, method_name, method_args, backend_hg):
+        """
+        Check that the listed methods are invalidating the VCSServer cache
+        after invoking a writing method of their remote repository object.
+        """
+        tags = {'mytag': 'mytag-id'}
+
+        def add_tag(name, raw_id, *args, **kwds):
+            tags[name] = raw_id
+
+        repo = backend_hg.repo.scm_instance()
+        with patch.object(repo, '_remote') as remote:
+            remote.lookup.return_value = ('commit-id', 'commit-idx')
+            remote.tags.return_value = tags
+            remote._get_tags.return_value = tags
+            remote.tag.side_effect = add_tag
+
+            # Invoke method.
+            method = getattr(repo, method_name)
+            method(*method_args)
+
+            # Assert that every "writing" method is followed by an invocation
+            # of the cache invalidation method.
+            for counter, method_call in enumerate(remote.method_calls):
+                call_name = method_call[0]
+                if call_name in self.writing_methods:
+                    next_call = remote.method_calls[counter + 1]
+                    assert next_call == call.invalidate_vcs_cache()
+
+    def _prepare_shadow_repo(self, pull_request):
+        """
+        Helper that creates a shadow repo that can be used to reproduce the
+        CommitDoesNotExistError when pulling in from target and source
+        references.
+        """
+        from rhodecode.model.pull_request import PullRequestModel
+
+        target_vcs = pull_request.target_repo.scm_instance()
+        target_ref = pull_request.target_ref_parts
+        source_ref = pull_request.source_ref_parts
+
+        # Create shadow repository.
+        pr = PullRequestModel()
+        workspace_id = pr._workspace_id(pull_request)
+        shadow_repository_path = target_vcs._maybe_prepare_merge_workspace(
+            workspace_id, target_ref)
+        shadow_repo = target_vcs._get_shadow_instance(shadow_repository_path)
+
+        # This will populate the cache of the mercurial repository object
+        # inside of the VCSServer.
+        shadow_repo.get_commit()
+
+        return shadow_repo, source_ref, target_ref
+
+    @pytest.mark.backends('hg')
+    def test_commit_does_not_exist_error_happens(self, pr_util, pylonsapp):
+        """
+        This test is somewhat special. It does not really test the system
+        instead it is more or less a precondition for the
+        "test_commit_does_not_exist_error_does_not_happen". It deactivates the
+        cache invalidation and asserts that the error occurs.
+        """
+        from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError
+
+        if pylonsapp.config['vcs.server.protocol'] == 'pyro4':
+            pytest.skip('Test is intended for the HTTP protocol only.')
+
+        pull_request = pr_util.create_pull_request()
+        target_vcs = pull_request.target_repo.scm_instance()
+        source_vcs = pull_request.source_repo.scm_instance()
+        shadow_repo, source_ref, target_ref = self._prepare_shadow_repo(
+            pull_request)
+
+        # Pull from target and source references but without invalidation of
+        # RemoteRepo objects and without VCSServer caching of mercurial
+        # repository objects.
+        with patch.object(shadow_repo._remote, 'invalidate_vcs_cache'):
+            # NOTE: Do not use patch.dict() to disable the cache because it
+            # restores the WHOLE dict and not only the patched keys.
+            shadow_repo._remote._wire['cache'] = False
+            shadow_repo._local_pull(target_vcs.path, target_ref)
+            shadow_repo._local_pull(source_vcs.path, source_ref)
+            shadow_repo._remote._wire.pop('cache')
+
+        # Try to lookup the target_ref in shadow repo. This should work because
+        # the shadow repo is a clone of the target and always contains all off
+        # it's commits in the initial cache.
+        shadow_repo.get_commit(target_ref.commit_id)
+
+        # If we try to lookup the source_ref it should fail because the shadow
+        # repo commit cache doesn't get invalidated. (Due to patched
+        # invalidation and caching above).
+        with pytest.raises(CommitDoesNotExistError):
+            shadow_repo.get_commit(source_ref.commit_id)
+
+    @pytest.mark.backends('hg')
+    def test_commit_does_not_exist_error_does_not_happen(
+            self, pr_util, pylonsapp):
+        """
+        This test simulates a pull request merge in which the pull operations
+        are handled by a different VCSServer process than all other operations.
+        Without correct cache invalidation this leads to an error when
+        retrieving the pulled commits afterwards.
+        """
+        if pylonsapp.config['vcs.server.protocol'] == 'pyro4':
+            pytest.skip('Test is intended for the HTTP protocol only.')
+
+        pull_request = pr_util.create_pull_request()
+        target_vcs = pull_request.target_repo.scm_instance()
+        source_vcs = pull_request.source_repo.scm_instance()
+        shadow_repo, source_ref, target_ref = self._prepare_shadow_repo(
+            pull_request)
+
+        # Pull from target and source references without without VCSServer
+        # caching of mercurial repository objects but with active invalidation
+        # of RemoteRepo objects.
+        # NOTE: Do not use patch.dict() to disable the cache because it
+        # restores the WHOLE dict and not only the patched keys.
+        shadow_repo._remote._wire['cache'] = False
+        shadow_repo._local_pull(target_vcs.path, target_ref)
+        shadow_repo._local_pull(source_vcs.path, source_ref)
+        shadow_repo._remote._wire.pop('cache')
+
+        # Try to lookup the target and source references in shadow repo. This
+        # should work because the RemoteRepo object gets invalidated during the
+        # above pull operations.
+        shadow_repo.get_commit(target_ref.commit_id)
+        shadow_repo.get_commit(source_ref.commit_id)

.bumpversion.cfg

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

.hgignore

@@ -25,6 +25,7 b' syntax: regexp'
 ^build/
 ^coverage\.xml$
 ^data$
+^\.eggs/
 ^configs/data$
 ^dev.ini$
 ^acceptance_tests/dev.*\.ini$

.release.cfg

@@ -4,26 +4,21 b' done = false'
 [task:bump_version]
 done = true
 
-[task:rc_tools_pinned]
-done = true
-
 [task:fixes_on_stable]
-done = true
 
 [task:pip2nix_generated]
-done = true
 
 [task:changelog_updated]
-done = true
 
 [task:generate_api_docs]
-done = true
+
+[task:updated_translation]
 
 [release]
-state = prepared
-version = 4.2.1
+state = in_progress
+version = 4.3.0
 
-[task:updated_translation]
+[task:rc_tools_pinned]
 
 [task:generate_js_routes]
 

Gruntfile.js

@@ -20,6 +20,7 b' module.exports = function(grunt) {'
           '<%= dirs.js.src %>/moment.js',
           '<%= dirs.js.src %>/appenlight-client-0.4.1.min.js',
           '<%= dirs.js.src %>/i18n_utils.js',
+          '<%= dirs.js.src %>/deform.js',
 
           // Plugins
           '<%= dirs.js.src %>/plugins/jquery.pjax.js',
@@ -31,6 +32,7 b' module.exports = function(grunt) {'
           '<%= dirs.js.src %>/plugins/jquery.mark.js',
           '<%= dirs.js.src %>/plugins/jquery.timeago.js',
           '<%= dirs.js.src %>/plugins/jquery.timeago-extension.js',
+          '<%= dirs.js.src %>/plugins/toastr.js',
 
           // Select2
           '<%= dirs.js.src %>/select2/select2.js',
@@ -56,12 +58,14 b' module.exports = function(grunt) {'
           '<%= dirs.js.src %>/rhodecode/utils/colorgenerator.js',
           '<%= dirs.js.src %>/rhodecode/utils/ie.js',
           '<%= dirs.js.src %>/rhodecode/utils/os.js',
+          '<%= dirs.js.src %>/rhodecode/utils/topics.js',
 
           // Rhodecode widgets
           '<%= dirs.js.src %>/rhodecode/widgets/multiselect.js',
 
           // Rhodecode components
           '<%= dirs.js.src %>/rhodecode/init.js',
+          '<%= dirs.js.src %>/rhodecode/connection_controller.js',
           '<%= dirs.js.src %>/rhodecode/codemirror.js',
           '<%= dirs.js.src %>/rhodecode/comments.js',
           '<%= dirs.js.src %>/rhodecode/constants.js',
@@ -76,6 +80,7 b' module.exports = function(grunt) {'
           '<%= dirs.js.src %>/rhodecode/select2_widgets.js',
           '<%= dirs.js.src %>/rhodecode/tooltips.js',
           '<%= dirs.js.src %>/rhodecode/users.js',
+          '<%= dirs.js.src %>/rhodecode/utils/notifications.js',
           '<%= dirs.js.src %>/rhodecode/appenlight.js',
 
           // Rhodecode main module

LICENSE.txt

@@ -10,8 +10,10 b' permission notice:'
        file:
    Copyright (c) 2008-2011 - msgpack-python
        file:licenses/msgpack_license.txt
+   Copyright (c) 2009 - tornado
+       file:licenses/tornado_license.txt
 
-Both licensed under the Apache License, Version 2.0 (the "License");
+All licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 

MANIFEST.in

@@ -2,20 +2,20 b''
 include test.ini
 include MANIFEST.in
 include README.rst
+include CHANGES.rst
+include LICENSE.txt
+
 include rhodecode/VERSION
 
 # docs
 recursive-include docs *
 
-# init.d
-recursive-include init.d *
+# all config files
+recursive-include configs *
 
 # translations
 recursive-include rhodecode/i18n *
 
-# bin stuff
-recursive-include rhodecode/bin *
-
 # hook templates
 recursive-include rhodecode/config/hook_templates *
 

Makefile

@@ -20,7 +20,7 b' ci-docs: docs;'
 clean: test-clean
 	find . -type f \( -iname '*.c' -o -iname '*.pyc' -o -iname '*.so' \) -exec rm '{}' ';'
 
-test: test-clean test-lint test-only
+test: test-clean test-only
 
 test-clean:
 	rm -rf coverage.xml htmlcov junit.xml pylint.log result

configs/development.ini

@@ -1,23 +1,36 b''
-################################################################################
+
+
 ################################################################################
-# RhodeCode Enterprise - configuration file                                    #
-# Built-in functions and variables                                             #
+##                    RHODECODE ENTERPRISE CONFIGURATION                      ##
 # The %(here)s variable will be replaced with the parent directory of this file#
-#                                                                              #
 ################################################################################
 
 [DEFAULT]
 debug = true
+
 ################################################################################
+##                            EMAIL CONFIGURATION                             ##
 ## Uncomment and replace with the email address which should receive          ##
 ## any error reports after an application crash                               ##
 ## Additionally these settings will be used by the RhodeCode mailing system   ##
 ################################################################################
-#email_to = admin@localhost
-#error_email_from = paste_error@localhost
+
+## prefix all emails subjects with given prefix, helps filtering out emails
+#email_prefix = [RhodeCode]
+
+## email FROM address all mails will be sent
 #app_email_from = rhodecode-noreply@localhost
+
+## Uncomment and replace with the address which should receive any error report
+## note: using appenlight for error handling doesn't need this to be uncommented
+#email_to = admin@localhost
+
+## in case of Application errors, sent an error email form
+#error_email_from = rhodecode_error@localhost
+
+## additional error message to be send in case of server crash
 #error_message =
-#email_prefix = [RhodeCode]
+
 
 #smtp_server = mail.server.com
 #smtp_username =
@@ -37,6 +50,7 b' port = 5000'
 ##     WAITRESS WSGI SERVER     ##
 ## Recommended for Development  ##
 ##################################
+
 use = egg:waitress#main
 ## number of worker threads
 threads = 5
@@ -51,6 +65,7 b' asyncore_use_poll = true'
 ## GUNICORN WSGI SERVER ##
 ##########################
 ## run with gunicorn --log-config <inifile.ini> --paste <inifile.ini>
+
 #use = egg:gunicorn#main
 ## Sets the number of process workers. You must set `instance_id = *`
 ## when this option is set to more than one worker, recommended
@@ -77,15 +92,18 b' asyncore_use_poll = true'
 
 
 ## prefix middleware for RhodeCode, disables force_https flag.
+## recommended when using proxy setup.
 ## allows to set RhodeCode under a prefix in server.
 ## eg https://server.com/<prefix>. Enable `filter-with =` option below as well.
-#[filter:proxy-prefix]
-#use = egg:PasteDeploy#prefix
-#prefix = /<your-prefix>
+## optionally set prefix like: `prefix = /<your-prefix>`
+[filter:proxy-prefix]
+use = egg:PasteDeploy#prefix
+prefix = /
 
 [app:main]
 use = egg:rhodecode-enterprise-ce
-## enable proxy prefix middleware, defined below
+
+## enable proxy prefix middleware, defined above
 #filter-with = proxy-prefix
 
 # During development the we want to have the debug toolbar enabled
@@ -123,12 +141,10 b' rhodecode.api.url = /_admin/api'
 ## `SignatureVerificationError` in case of wrong key, or damaged encryption data.
 #rhodecode.encrypted_values.strict = false
 
-full_stack = true
+## return gzipped responses from Rhodecode (static files/application)
+gzip_responses = false
 
-## Serve static files via RhodeCode, disable to serve them via HTTP server
-static_files = true
-
-# autogenerate javascript routes file on startup
+## autogenerate javascript routes file on startup
 generate_js_files = false
 
 ## Optional Languages
@@ -317,8 +333,8 b' beaker.cache.sql_cache_short.type = memo'
 beaker.cache.sql_cache_short.expire = 10
 beaker.cache.sql_cache_short.key_length = 256
 
-# default is memory cache, configure only if required
-# using multi-node or multi-worker setup
+## default is memory cache, configure only if required
+## using multi-node or multi-worker setup
 #beaker.cache.auth_plugins.type = ext:database
 #beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
 #beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
@@ -331,8 +347,8 b' beaker.cache.repo_cache_long.type = memo'
 beaker.cache.repo_cache_long.max_items = 4096
 beaker.cache.repo_cache_long.expire = 2592000
 
-# default is memorylru_base cache, configure only if required
-# using multi-node or multi-worker setup
+## default is memorylru_base cache, configure only if required
+## using multi-node or multi-worker setup
 #beaker.cache.repo_cache_long.type = ext:memcached
 #beaker.cache.repo_cache_long.url = localhost:11211
 #beaker.cache.repo_cache_long.expire = 1209600
@@ -347,7 +363,7 b' beaker.cache.repo_cache_long.expire = 25'
 beaker.session.type = file
 beaker.session.data_dir = %(here)s/data/sessions/data
 
-## db based session, fast, and allows easy management over logged in users ##
+## db based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
 #beaker.session.table_name = db_session
 #beaker.session.sa.url = postgresql://postgres:secret@localhost/rhodecode
@@ -368,6 +384,7 b' beaker.session.lock_dir = %(here)s/data/'
 ## accessed for given amount of time in seconds
 beaker.session.timeout = 2592000
 beaker.session.httponly = true
+## Path to use for the cookie.
 #beaker.session.cookie_path = /<your-prefix>
 
 ## uncomment for https secure cookie
@@ -391,6 +408,23 b' beaker.session.auto = false'
 search.module = rhodecode.lib.index.whoosh
 search.location = %(here)s/data/index
 
+########################################
+###    CHANNELSTREAM CONFIG         ####
+########################################
+## channelstream enables persistent connections and live notification
+## in the system. It's also used by the chat system
+
+channelstream.enabled = true
+## location of channelstream server on the backend
+channelstream.server = 127.0.0.1:9800
+## location of the channelstream server from outside world
+## most likely this would be an http server special backend URL, that handles
+## websocket connections see nginx example for config
+channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
+channelstream.secret = secret
+channelstream.history.location = %(here)s/channelstream_history
+
+
 ###################################
 ##       APPENLIGHT CONFIG       ##
 ###################################
@@ -466,9 +500,10 b' debug_style = true'
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
-sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
+#sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
 #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
+sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
 
 # see sqlalchemy docs for other advanced settings
 
@@ -498,28 +533,53 b' vcs.server = localhost:9900'
 ## Available protocols are:
 ## `pyro4` - using pyro4 server
 ## `http` - using http-rpc backend
-#vcs.server.protocol = http
+vcs.server.protocol = http
 
 ## Push/Pull operations protocol, available options are:
 ## `pyro4` - using pyro4 server
 ## `rhodecode.lib.middleware.utils.scm_app_http` - Http based, recommended
 ## `vcsserver.scm_app` - internal app (EE only)
-#vcs.scm_app_implementation = rhodecode.lib.middleware.utils.scm_app_http
+vcs.scm_app_implementation = rhodecode.lib.middleware.utils.scm_app_http
 
 ## Push/Pull operations hooks protocol, available options are:
 ## `pyro4` - using pyro4 server
 ## `http` - using http-rpc backend
-#vcs.hooks.protocol = http
+vcs.hooks.protocol = http
 
 vcs.server.log_level = debug
 ## Start VCSServer with this instance as a subprocess, usefull for development
 vcs.start_server = true
+
+## List of enabled VCS backends, available options are:
+## `hg`  - mercurial
+## `git` - git
+## `svn` - subversion
 vcs.backends = hg, git, svn
+
 vcs.connection_timeout = 3600
 ## Compatibility version when creating SVN repositories. Defaults to newest version when commented out.
 ## Available options are: pre-1.4-compatible, pre-1.5-compatible, pre-1.6-compatible, pre-1.8-compatible
 #vcs.svn.compatible_version = pre-1.8-compatible
 
+
+############################################################
+### Subversion proxy support (mod_dav_svn)               ###
+### Maps RhodeCode repo groups into SVN paths for Apache ###
+############################################################
+## Enable or disable the config file generation.
+svn.proxy.generate_config = false
+## Generate config file with `SVNListParentPath` set to `On`.
+svn.proxy.list_parent_path = true
+## Set location and file name of generated config file.
+svn.proxy.config_file_path = %(here)s/mod_dav_svn.conf
+## File system path to the directory containing the repositories served by
+## RhodeCode.
+svn.proxy.parent_path_root = /path/to/repo_store
+## Used as a prefix to the <Location> block in the generated config file. In
+## most cases it should be set to `/`.
+svn.proxy.location_root = /
+
+
 ################################
 ### LOGGING CONFIGURATION   ####
 ################################

configs/production.ini

@@ -1,23 +1,36 b''
-################################################################################
+
+
 ################################################################################
-# RhodeCode Enterprise - configuration file                                    #
-# Built-in functions and variables                                             #
+##                    RHODECODE ENTERPRISE CONFIGURATION                      ##
 # The %(here)s variable will be replaced with the parent directory of this file#
-#                                                                              #
 ################################################################################
 
 [DEFAULT]
 debug = true
+
 ################################################################################
+##                            EMAIL CONFIGURATION                             ##
 ## Uncomment and replace with the email address which should receive          ##
 ## any error reports after an application crash                               ##
 ## Additionally these settings will be used by the RhodeCode mailing system   ##
 ################################################################################
-#email_to = admin@localhost
-#error_email_from = paste_error@localhost
+
+## prefix all emails subjects with given prefix, helps filtering out emails
+#email_prefix = [RhodeCode]
+
+## email FROM address all mails will be sent
 #app_email_from = rhodecode-noreply@localhost
+
+## Uncomment and replace with the address which should receive any error report
+## note: using appenlight for error handling doesn't need this to be uncommented
+#email_to = admin@localhost
+
+## in case of Application errors, sent an error email form
+#error_email_from = rhodecode_error@localhost
+
+## additional error message to be send in case of server crash
 #error_message =
-#email_prefix = [RhodeCode]
+
 
 #smtp_server = mail.server.com
 #smtp_username =
@@ -37,6 +50,7 b' port = 5000'
 ##     WAITRESS WSGI SERVER     ##
 ## Recommended for Development  ##
 ##################################
+
 #use = egg:waitress#main
 ## number of worker threads
 #threads = 5
@@ -51,6 +65,7 b' port = 5000'
 ## GUNICORN WSGI SERVER ##
 ##########################
 ## run with gunicorn --log-config <inifile.ini> --paste <inifile.ini>
+
 use = egg:gunicorn#main
 ## Sets the number of process workers. You must set `instance_id = *`
 ## when this option is set to more than one worker, recommended
@@ -77,15 +92,18 b' timeout = 21600'
 
 
 ## prefix middleware for RhodeCode, disables force_https flag.
+## recommended when using proxy setup.
 ## allows to set RhodeCode under a prefix in server.
 ## eg https://server.com/<prefix>. Enable `filter-with =` option below as well.
-#[filter:proxy-prefix]
-#use = egg:PasteDeploy#prefix
-#prefix = /<your-prefix>
+## optionally set prefix like: `prefix = /<your-prefix>`
+[filter:proxy-prefix]
+use = egg:PasteDeploy#prefix
+prefix = /
 
 [app:main]
 use = egg:rhodecode-enterprise-ce
-## enable proxy prefix middleware, defined below
+
+## enable proxy prefix middleware, defined above
 #filter-with = proxy-prefix
 
 ## encryption key used to encrypt social plugin tokens,
@@ -97,12 +115,10 b' use = egg:rhodecode-enterprise-ce'
 ## `SignatureVerificationError` in case of wrong key, or damaged encryption data.
 #rhodecode.encrypted_values.strict = false
 
-full_stack = true
+## return gzipped responses from Rhodecode (static files/application)
+gzip_responses = false
 
-## Serve static files via RhodeCode, disable to serve them via HTTP server
-static_files = true
-
-# autogenerate javascript routes file on startup
+## autogenerate javascript routes file on startup
 generate_js_files = false
 
 ## Optional Languages
@@ -291,8 +307,8 b' beaker.cache.sql_cache_short.type = memo'
 beaker.cache.sql_cache_short.expire = 10
 beaker.cache.sql_cache_short.key_length = 256
 
-# default is memory cache, configure only if required
-# using multi-node or multi-worker setup
+## default is memory cache, configure only if required
+## using multi-node or multi-worker setup
 #beaker.cache.auth_plugins.type = ext:database
 #beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
 #beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
@@ -305,8 +321,8 b' beaker.cache.repo_cache_long.type = memo'
 beaker.cache.repo_cache_long.max_items = 4096
 beaker.cache.repo_cache_long.expire = 2592000
 
-# default is memorylru_base cache, configure only if required
-# using multi-node or multi-worker setup
+## default is memorylru_base cache, configure only if required
+## using multi-node or multi-worker setup
 #beaker.cache.repo_cache_long.type = ext:memcached
 #beaker.cache.repo_cache_long.url = localhost:11211
 #beaker.cache.repo_cache_long.expire = 1209600
@@ -321,7 +337,7 b' beaker.cache.repo_cache_long.expire = 25'
 beaker.session.type = file
 beaker.session.data_dir = %(here)s/data/sessions/data
 
-## db based session, fast, and allows easy management over logged in users ##
+## db based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
 #beaker.session.table_name = db_session
 #beaker.session.sa.url = postgresql://postgres:secret@localhost/rhodecode
@@ -342,6 +358,7 b' beaker.session.lock_dir = %(here)s/data/'
 ## accessed for given amount of time in seconds
 beaker.session.timeout = 2592000
 beaker.session.httponly = true
+## Path to use for the cookie.
 #beaker.session.cookie_path = /<your-prefix>
 
 ## uncomment for https secure cookie
@@ -365,6 +382,23 b' beaker.session.auto = false'
 search.module = rhodecode.lib.index.whoosh
 search.location = %(here)s/data/index
 
+########################################
+###    CHANNELSTREAM CONFIG         ####
+########################################
+## channelstream enables persistent connections and live notification
+## in the system. It's also used by the chat system
+
+channelstream.enabled = true
+## location of channelstream server on the backend
+channelstream.server = 127.0.0.1:9800
+## location of the channelstream server from outside world
+## most likely this would be an http server special backend URL, that handles
+## websocket connections see nginx example for config
+channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
+channelstream.secret = secret
+channelstream.history.location = %(here)s/channelstream_history
+
+
 ###################################
 ##       APPENLIGHT CONFIG       ##
 ###################################
@@ -436,8 +470,9 b' set debug = false'
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
 #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
+#sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
+#sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
 sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
-#sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
 
 # see sqlalchemy docs for other advanced settings
 
@@ -483,12 +518,37 b' vcs.server = localhost:9900'
 vcs.server.log_level = info
 ## Start VCSServer with this instance as a subprocess, usefull for development
 vcs.start_server = false
+
+## List of enabled VCS backends, available options are:
+## `hg`  - mercurial
+## `git` - git
+## `svn` - subversion
 vcs.backends = hg, git, svn
+
 vcs.connection_timeout = 3600
 ## Compatibility version when creating SVN repositories. Defaults to newest version when commented out.
 ## Available options are: pre-1.4-compatible, pre-1.5-compatible, pre-1.6-compatible, pre-1.8-compatible
 #vcs.svn.compatible_version = pre-1.8-compatible
 
+
+############################################################
+### Subversion proxy support (mod_dav_svn)               ###
+### Maps RhodeCode repo groups into SVN paths for Apache ###
+############################################################
+## Enable or disable the config file generation.
+svn.proxy.generate_config = false
+## Generate config file with `SVNListParentPath` set to `On`.
+svn.proxy.list_parent_path = true
+## Set location and file name of generated config file.
+svn.proxy.config_file_path = %(here)s/mod_dav_svn.conf
+## File system path to the directory containing the repositories served by
+## RhodeCode.
+svn.proxy.parent_path_root = /path/to/repo_store
+## Used as a prefix to the <Location> block in the generated config file. In
+## most cases it should be set to `/`.
+svn.proxy.location_root = /
+
+
 ################################
 ### LOGGING CONFIGURATION   ####
 ################################

default.nix

@@ -123,8 +123,9 b' let'
       # pkgs/default.nix?
       passthru = {
         inherit
-          pythonLocalOverrides
-          myPythonPackagesUnfix;
+          linkNodeModules
+          myPythonPackagesUnfix
+          pythonLocalOverrides;
         pythonPackages = self;
       };
 
@@ -165,6 +166,7 b' let'
         ln -s ${self.supervisor}/bin/supervisor* $out/bin/
         ln -s ${self.gunicorn}/bin/gunicorn $out/bin/
         ln -s ${self.PasteScript}/bin/paster $out/bin/
+        ln -s ${self.channelstream}/bin/channelstream $out/bin/
         ln -s ${self.pyramid}/bin/* $out/bin/  #*/
 
         # rhodecode-tools

docs/admin/apache-reverse-proxy.rst

@@ -9,9 +9,9 b' Here is a sample configuration file for '
             ServerName hg.myserver.com
             ServerAlias hg.myserver.com
 
-            ## uncomment root directive if you want to serve static files by
-            ## Apache requires static_files = false in .ini file
-            #DocumentRoot /path/to/rhodecode/installation/public
+            ## uncomment to serve static files by Apache
+            ## ProxyPass /_static/rhodecode !
+            ## Alias /_static/rhodecode /path/to/.rccontrol/enterprise-1/static
 
             <Proxy *>
               Order allow,deny

docs/admin/apache-subdirectory.rst

@@ -16,17 +16,18 b' Use the following example to configure A'
 In addition to the regular Apache setup you will need to add the following
 lines into the ``rhodecode.ini`` file.
 
+* Above ``[app:main]`` section of the ``rhodecode.ini`` file add the
+  following section if it doesn't exist yet.
+
+.. code-block:: ini
+
+    [filter:proxy-prefix]
+    use = egg:PasteDeploy#prefix
+    prefix = /<someprefix> # Change <someprefix> into your chosen prefix
+
 * In the the ``[app:main]`` section of your ``rhodecode.ini`` file add the
   following line.
 
 .. code-block:: ini
 
     filter-with = proxy-prefix
-
-* At the end of the ``rhodecode.ini`` file add the following section.
-
-.. code-block:: ini
-
-    [filter:proxy-prefix]
-    use = egg:PasteDeploy#prefix
-    prefix = /<someprefix> # Change <someprefix> into your chosen prefix

docs/admin/backup-restore.rst

@@ -121,7 +121,7 b' then work on restoring any specific setu'
   :ref:`indexing-ref` section for details.
 * To reconfigure any extensions, copy the backed up extensions into the
   :file:`/home/{user}/.rccontrol/{instance-id}/rcextensions` and also specify
-  any custom hooks if necessary. See the :ref:`integrations-ref` section for
+  any custom hooks if necessary. See the :ref:`extensions-hooks-ref` section for
   details.
 
 .. _Schrödinger's Backup: http://novabackup.novastor.com/blog/schrodingers-backup-good-bad-backup/

docs/admin/nginx-config-example.rst

@@ -5,6 +5,11 b' Use the following example to configure N'
 
 .. code-block:: nginx
 
+    log_format log_custom '$remote_addr - $remote_user [$time_local] '
+                          '"$request" $status $body_bytes_sent '
+                          '"$http_referer" "$http_user_agent" '
+                          '$request_time $upstream_response_time $pipe';
+
     upstream rc {
 
         server 127.0.0.1:10002;
@@ -14,12 +19,12 b' Use the following example to configure N'
         # server 127.0.0.1:10004;
     }
 
-    ## gist alias
+    ## gist alias server, for serving nicer GIST urls
 
     server {
         listen          443;
         server_name     gist.myserver.com;
-        access_log      /var/log/nginx/gist.access.log;
+        access_log      /var/log/nginx/gist.access.log log_custom;
         error_log       /var/log/nginx/gist.error.log;
 
         ssl on;
@@ -28,23 +33,36 b' Use the following example to configure N'
 
         ssl_session_timeout 5m;
 
-        ssl_protocols SSLv3 TLSv1;
-        ssl_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:EDH-RSA-DES-CBC3-SHA:AES256-SHA:DES-CBC3-SHA:AES128-SHA:RC4-SHA:RC4-MD5;
+        ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
         ssl_prefer_server_ciphers on;
+        ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA';
+
         add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;";
 
         # Diffie-Hellman parameter for DHE ciphersuites, recommended 2048 bits
-        ssl_dhparam /etc/nginx/ssl/dhparam.pem;
+        #ssl_dhparam /etc/nginx/ssl/dhparam.pem;
 
         rewrite ^/(.+)$ https://rhodecode.myserver.com/_admin/gists/$1;
         rewrite (.*)    https://rhodecode.myserver.com/_admin/gists;
     }
 
+    ## HTTP to HTTPS rewrite
     server {
-        listen          443;
+        listen          80;
         server_name     rhodecode.myserver.com;
-        access_log      /var/log/nginx/rhodecode.access.log;
-        error_log       /var/log/nginx/rhodecode.error.log;
+
+        if ($http_host = rhodecode.myserver.com) {
+            rewrite  (.*)  https://rhodecode.myserver.com$1 permanent;
+        }
+    }
+
+    ## MAIN SSL enabled server
+    server {
+        listen       443 ssl;
+        server_name  rhodecode.myserver.com;
+
+        access_log   /var/log/nginx/rhodecode.access.log log_custom;
+        error_log    /var/log/nginx/rhodecode.error.log;
 
         ssl on;
         ssl_certificate     rhodecode.myserver.com.crt;
@@ -52,21 +70,51 b' Use the following example to configure N'
 
         ssl_session_timeout 5m;
 
-        ssl_protocols SSLv3 TLSv1;
-        ssl_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:EDH-RSA-DES-CBC3-SHA:AES256-SHA:DES-CBC3-SHA:AES128-SHA:RC4-SHA:RC4-MD5;
+        ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
         ssl_prefer_server_ciphers on;
+        ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA';
+
+        # Diffie-Hellman parameter for DHE ciphersuites, recommended 2048 bits
+        #ssl_dhparam /etc/nginx/ssl/dhparam.pem;
+
+        include     /etc/nginx/proxy.conf;
+
+        ## serve static files by nginx, recommended
+        # location /_static/rhodecode {
+        #    alias /path/to/.rccontrol/enterprise-1/static;
+        # }
 
-        ## uncomment root directive if you want to serve static files by nginx
-        ## requires static_files = false in .ini file
-        # root /path/to/rhodecode/installation/public;
+        ## channel stream live components
+        location /_channelstream {
+            rewrite /_channelstream/(.*) /$1 break;
+            proxy_pass                  http://127.0.0.1:9800;
 
-        include         /etc/nginx/proxy.conf;
+            proxy_connect_timeout        10;
+            proxy_send_timeout           10m;
+            proxy_read_timeout           10m;
+            tcp_nodelay                  off;
+            proxy_set_header             Host $host;
+            proxy_set_header             X-Real-IP $remote_addr;
+            proxy_set_header             X-Url-Scheme $scheme;
+            proxy_set_header             X-Forwarded-Proto $scheme;
+            proxy_set_header             X-Forwarded-For $proxy_add_x_forwarded_for;
+            gzip                         off;
+            proxy_http_version           1.1;
+            proxy_set_header Upgrade     $http_upgrade;
+            proxy_set_header Connection  "upgrade";
+        }
 
         location / {
             try_files $uri @rhode;
         }
 
-       location @rhode {
-           proxy_pass      http://rc;
-       }
-    }
+        location @rhode {
+            proxy_pass      http://rc;
+        }
+
+        ## custom 502 error page
+        error_page 502 /502.html;
+        location = /502.html {
+           root  /path/to/.rccontrol/enterprise-1/static;
+        }
+    }
  No newline at end of file

docs/admin/nginx-url-prefix.rst

@@ -15,7 +15,16 b' Use the following example to configure N'
     }
 
 In addition to the Nginx configuration you will need to add the following
-lines into the ``rhodecode.ini`` file.
+lines (if they not exist) into the ``rhodecode.ini`` file.
+
+* Above ``[app:main]`` section of the ``rhodecode.ini`` file add the
+  following section if it doesn't exist yet.
+
+.. code-block:: ini
+
+    [filter:proxy-prefix]
+    use = egg:PasteDeploy#prefix
+    prefix = /<someprefix> # Change <someprefix> into your chosen prefix
 
 * In the the ``[app:main]`` section of your ``rhodecode.ini`` file add the
   following line.
@@ -24,10 +33,4 b' lines into the ``rhodecode.ini`` file.'
 
     filter-with = proxy-prefix
 
-* At the end of the ``rhodecode.ini`` file add the following section.
 
-.. code-block:: ini
-
-    [filter:proxy-prefix]
-    use = egg:PasteDeploy#prefix
-    prefix = /<someprefix> # Change <someprefix> into your chosen prefix

docs/admin/repo-extra-fields.rst

@@ -32,7 +32,7 b' Example Usage'
 -------------
 
 To use the extra fields in an extension, see the example below. For more
-information and examples, see the :ref:`integrations-ref` section.
+information and examples, see the :ref:`extensions-hooks-ref` section.
 
 .. code-block:: python
 

docs/admin/reset-information.rst

@@ -30,7 +30,7 b' account permissions.'
     # Use this example to change user permissions
     In [1]: adminuser = User.get_by_username('username')
     In [2]: adminuser.admin = True
-    In [3]: Session.add(adminuser);Session().commit()
+    In [3]: Session().add(adminuser);Session().commit()
     In [4]: exit()
 
 Set to read global ``.hgrc`` file

docs/admin/svn-http.rst

@@ -76,7 +76,7 b' following examples. For more |svn| infor'
 .. code-block:: bash
 
     # To clone a repository
-    svn clone http://my-svn-server.example.com/my-svn-repo
+    svn checkout http://my-svn-server.example.com/my-svn-repo
 
     # svn commit
     svn commit

docs/api/api.rst

@@ -194,2631 +194,14 b' are not required in args.'
    ApiController.
 
 .. --- API DEFS MARKER ---
-
-pull
-----
-
-.. py:function:: pull(apiuser, repoid)
-
-   Triggers a pull on the given repository from a remote location. You
-   can use this to keep remote repositories up-to-date.
-
-   This command can only be run using an |authtoken| with admin
-   rights to the specified repository. For more information,
-   see :ref:`config-token-ref`.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: The repository name or repository ID.
-   :type repoid: str or int
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       "msg": "Pulled from `<repository name>`"
-       "repository": "<repository name>"
-     }
-     error :  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "Unable to pull changes from `<reponame>`"
-     }
-
-
-strip
------
-
-.. py:function:: strip(apiuser, repoid, revision, branch)
-
-   Strips the given revision from the specified repository.
-
-   * This will remove the revision and all of its decendants.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: The repository name or repository ID.
-   :type repoid: str or int
-   :param revision: The revision you wish to strip.
-   :type revision: str
-   :param branch: The branch from which to strip the revision.
-   :type branch: str
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       "msg": "'Stripped commit <commit_hash> from repo `<repository name>`'"
-       "repository": "<repository name>"
-     }
-     error :  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "Unable to strip commit <commit_hash> from repo `<repository name>`"
-     }
-
-
-rescan_repos
-------------
-
-.. py:function:: rescan_repos(apiuser, remove_obsolete=<Optional:False>)
-
-   Triggers a rescan of the specified repositories.
-
-   * If the ``remove_obsolete`` option is set, it also deletes repositories
-     that are found in the database but not on the file system, so called
-     "clean zombies".
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param remove_obsolete: Deletes repositories from the database that
-       are not found on the filesystem.
-   :type remove_obsolete: Optional(``True`` | ``False``)
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       'added': [<added repository name>,...]
-       'removed': [<removed repository name>,...]
-     }
-     error :  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       'Error occurred during rescan repositories action'
-     }
-
-
-invalidate_cache
-----------------
-
-.. py:function:: invalidate_cache(apiuser, repoid, delete_keys=<Optional:False>)
-
-   Invalidates the cache for the specified repository.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Sets the repository name or repository ID.
-   :type repoid: str or int
-   :param delete_keys: This deletes the invalidated keys instead of
-       just flagging them.
-   :type delete_keys: Optional(``True`` | ``False``)
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       'msg': Cache for repository `<repository name>` was invalidated,
-       'repository': <repository name>
-     }
-     error :  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error : {
-        'Error occurred during cache invalidation action'
-     }
-
-
-lock
-----
-
-.. py:function:: lock(apiuser, repoid, locked=<Optional:None>, userid=<Optional:<OptionalAttr:apiuser>>)
-
-   Sets the lock state of the specified |repo| by the given user.
-   From more information, see :ref:`repo-locking`.
-
-   * If the ``userid`` option is not set, the repository is locked to the
-     user who called the method.
-   * If the ``locked`` parameter is not set, the current lock state of the
-     repository is displayed.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Sets the repository name or repository ID.
-   :type repoid: str or int
-   :param locked: Sets the lock state.
-   :type locked: Optional(``True`` | ``False``)
-   :param userid: Set the repository lock to this user.
-   :type userid: Optional(str or int)
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       'repo': '<reponame>',
-       'locked': <bool: lock state>,
-       'locked_since': <int: lock timestamp>,
-       'locked_by': <username of person who made the lock>,
-       'lock_reason': <str: reason for locking>,
-       'lock_state_changed': <bool: True if lock state has been changed in this request>,
-       'msg': 'Repo `<reponame>` locked by `<username>` on <timestamp>.'
-       or
-       'msg': 'Repo `<repository name>` not locked.'
-       or
-       'msg': 'User `<user name>` set lock state for repo `<repository name>` to `<new lock state>`'
-     }
-     error :  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       'Error occurred locking repository `<reponame>`
-     }
-
-
-get_locks
----------
-
-.. py:function:: get_locks(apiuser, userid=<Optional:<OptionalAttr:apiuser>>)
-
-   Displays all repositories locked by the specified user.
-
-   * If this command is run by a non-admin user, it returns
-     a list of |repos| locked by that user.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param userid: Sets the userid whose list of locked |repos| will be
-       displayed.
-   :type userid: Optional(str or int)
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result : {
-           [repo_object, repo_object,...]
-       }
-       error :  null
-
-
-get_ip
-------
-
-.. py:function:: get_ip(apiuser, userid=<Optional:<OptionalAttr:apiuser>>)
-
-   Displays the IP Address as seen from the |RCE| server.
-
-   * This command displays the IP Address, as well as all the defined IP
-     addresses for the specified user. If the ``userid`` is not set, the
-     data returned is for the user calling the method.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from |authtoken|.
-   :type apiuser: AuthUser
-   :param userid: Sets the userid for which associated IP Address data
-       is returned.
-   :type userid: Optional(str or int)
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result : {
-                    "server_ip_addr": "<ip_from_clien>",
-                    "user_ips": [
-                                   {
-                                      "ip_addr": "<ip_with_mask>",
-                                      "ip_range": ["<start_ip>", "<end_ip>"],
-                                   },
-                                   ...
-                                ]
-       }
-
-
-show_ip
--------
-
-.. py:function:: show_ip(apiuser, userid=<Optional:<OptionalAttr:apiuser>>)
-
-   Displays the IP Address as seen from the |RCE| server.
-
-   * This command displays the IP Address, as well as all the defined IP
-     addresses for the specified user. If the ``userid`` is not set, the
-     data returned is for the user calling the method.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from |authtoken|.
-   :type apiuser: AuthUser
-   :param userid: Sets the userid for which associated IP Address data
-       is returned.
-   :type userid: Optional(str or int)
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result : {
-                    "server_ip_addr": "<ip_from_clien>",
-                    "user_ips": [
-                                   {
-                                      "ip_addr": "<ip_with_mask>",
-                                      "ip_range": ["<start_ip>", "<end_ip>"],
-                                   },
-                                   ...
-                                ]
-       }
-
-
-get_license_info
-----------------
-
-.. py:function:: get_license_info(apiuser)
-
-   Returns the |RCE| license information.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       'rhodecode_version': <rhodecode version>,
-       'token': <license token>,
-       'issued_to': <license owner>,
-       'issued_on': <license issue date>,
-       'expires_on': <license expiration date>,
-       'type': <license type>,
-       'users_limit': <license users limit>,
-       'key': <license key>
-     }
-     error :  null
-
-
-set_license_key
----------------
-
-.. py:function:: set_license_key(apiuser, key)
-
-   Sets the |RCE| license key.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param key: This is the license key to be set.
-   :type key: str
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg" : "updated license information",
-                 "key": <key>
-               }
-       error:  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "license key is not valid"
-       or
-       "trial licenses cannot be uploaded"
-       or
-       "error occurred while updating license"
-     }
-
-
-get_server_info
----------------
-
-.. py:function:: get_server_info(apiuser)
-
-   Returns the |RCE| server information.
-
-   This includes the running version of |RCE| and all installed
-   packages. This command takes the following options:
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       'modules': [<module name>,...]
-       'py_version': <python version>,
-       'platform': <platform type>,
-       'rhodecode_version': <rhodecode version>
-     }
-     error :  null
-
-
-get_user
---------
-
-.. py:function:: get_user(apiuser, userid=<Optional:<OptionalAttr:apiuser>>)
-
-   Returns the information associated with a username or userid.
-
-   * If the ``userid`` is not set, this command returns the information
-     for the ``userid`` calling the method.
-
-   .. note::
-
-      Normal users may only run this command against their ``userid``. For
-      full privileges you must run this command using an |authtoken| with
-      admin rights.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param userid: Sets the userid for which data will be returned.
-   :type userid: Optional(str or int)
-
-   Example output:
-
-   .. code-block:: bash
-
-       {
-         "error": null,
-         "id": <id>,
-         "result": {
-           "active": true,
-           "admin": false,
-           "api_key": "api-key",
-           "api_keys": [ list of keys ],
-           "email": "[e-mail]",
-           "emails": [
-             "[e-mail]"
-           ],
-           "extern_name": "rhodecode",
-           "extern_type": "rhodecode",
-           "firstname": "username",
-           "ip_addresses": [],
-           "language": null,
-           "last_login": "Timestamp",
-           "lastname": "surnae",
-           "permissions": {
-             "global": [
-               "hg.inherit_default_perms.true",
-               "usergroup.read",
-               "hg.repogroup.create.false",
-               "hg.create.none",
-               "hg.extern_activate.manual",
-               "hg.create.write_on_repogroup.false",
-               "hg.usergroup.create.false",
-               "group.none",
-               "repository.none",
-               "hg.register.none",
-               "hg.fork.repository"
-             ],
-             "repositories": { "username/example": "repository.write"},
-             "repositories_groups": { "user-group/repo": "group.none" },
-             "user_groups": { "user_group_name": "usergroup.read" }
-           },
-           "user_id": 32,
-           "username": "username"
-         }
-       }
-
-
-get_users
----------
-
-.. py:function:: get_users(apiuser)
-
-   Lists all users in the |RCE| user database.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-           result: [<user_object>, ...]
-       error:  null
-
-
-create_user
------------
-
-.. py:function:: create_user(apiuser, username, email, password=<Optional:''>, firstname=<Optional:''>, lastname=<Optional:''>, active=<Optional:True>, admin=<Optional:False>, extern_name=<Optional:'rhodecode'>, extern_type=<Optional:'rhodecode'>, force_password_change=<Optional:False>)
-
-   Creates a new user and returns the new user object.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param username: Set the new username.
-   :type username: str or int
-   :param email: Set the user email address.
-   :type email: str
-   :param password: Set the new user password.
-   :type password: Optional(str)
-   :param firstname: Set the new user firstname.
-   :type firstname: Optional(str)
-   :param lastname: Set the new user surname.
-   :type lastname: Optional(str)
-   :param active: Set the user as active.
-   :type active: Optional(``True`` | ``False``)
-   :param admin: Give the new user admin rights.
-   :type admin: Optional(``True`` | ``False``)
-   :param extern_name: Set the authentication plugin name.
-       Using LDAP this is filled with LDAP UID.
-   :type extern_name: Optional(str)
-   :param extern_type: Set the new user authentication plugin.
-   :type extern_type: Optional(str)
-   :param force_password_change: Force the new user to change password
-       on next login.
-   :type force_password_change: Optional(``True`` | ``False``)
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg" : "created new user `<username>`",
-                 "user": <user_obj>
-               }
-       error:  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "user `<username>` already exist"
-       or
-       "email `<email>` already exist"
-       or
-       "failed to create user `<username>`"
-     }
-
-
-update_user
------------
-
-.. py:function:: update_user(apiuser, userid, username=<Optional:None>, email=<Optional:None>, password=<Optional:None>, firstname=<Optional:None>, lastname=<Optional:None>, active=<Optional:None>, admin=<Optional:None>, extern_type=<Optional:None>, extern_name=<Optional:None>)
-
-   Updates the details for the specified user, if that user exists.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from |authtoken|.
-   :type apiuser: AuthUser
-   :param userid: Set the ``userid`` to update.
-   :type userid: str or int
-   :param username: Set the new username.
-   :type username: str or int
-   :param email: Set the new email.
-   :type email: str
-   :param password: Set the new password.
-   :type password: Optional(str)
-   :param firstname: Set the new first name.
-   :type firstname: Optional(str)
-   :param lastname: Set the new surname.
-   :type lastname: Optional(str)
-   :param active: Set the new user as active.
-   :type active: Optional(``True`` | ``False``)
-   :param admin: Give the user admin rights.
-   :type admin: Optional(``True`` | ``False``)
-   :param extern_name: Set the authentication plugin user name.
-       Using LDAP this is filled with LDAP UID.
-   :type extern_name: Optional(str)
-   :param extern_type: Set the authentication plugin type.
-   :type extern_type: Optional(str)
-
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg" : "updated user ID:<userid> <username>",
-                 "user": <user_object>,
-               }
-       error:  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "failed to update user `<username>`"
-     }
-
-
-delete_user
------------
-
-.. py:function:: delete_user(apiuser, userid)
-
-   Deletes the specified user from the |RCE| user database.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   .. important::
-
-      Ensure all open pull requests and open code review
-      requests to this user are close.
-
-      Also ensure all repositories, or repository groups owned by this
-      user are reassigned before deletion.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param userid: Set the user to delete.
-   :type userid: str or int
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg" : "deleted user ID:<userid> <username>",
-                 "user": null
-               }
-       error:  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "failed to delete user ID:<userid> <username>"
-     }
-
-
-get_user_group
---------------
-
-.. py:function:: get_user_group(apiuser, usergroupid)
-
-   Returns the data of an existing user group.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param usergroupid: Set the user group from which to return data.
-   :type usergroupid: str or int
-
-   Example error output:
-
-   .. code-block:: bash
-
-       {
-         "error": null,
-         "id": <id>,
-         "result": {
-           "active": true,
-           "group_description": "group description",
-           "group_name": "group name",
-           "members": [
-             {
-               "name": "owner-name",
-               "origin": "owner",
-               "permission": "usergroup.admin",
-               "type": "user"
-             },
-             {
-             {
-               "name": "user name",
-               "origin": "permission",
-               "permission": "usergroup.admin",
-               "type": "user"
-             },
-             {
-               "name": "user group name",
-               "origin": "permission",
-               "permission": "usergroup.write",
-               "type": "user_group"
-             }
-           ],
-           "owner": "owner name",
-           "users": [],
-           "users_group_id": 2
-         }
-       }
-
-
-get_user_groups
----------------
-
-.. py:function:: get_user_groups(apiuser)
-
-   Lists all the existing user groups within RhodeCode.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-
-   Example error output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result : [<user_group_obj>,...]
-       error : null
-
-
-create_user_group
------------------
-
-.. py:function:: create_user_group(apiuser, group_name, description=<Optional:''>, owner=<Optional:<OptionalAttr:apiuser>>, active=<Optional:True>)
-
-   Creates a new user group.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param group_name: Set the name of the new user group.
-   :type group_name: str
-   :param description: Give a description of the new user group.
-   :type description: str
-   :param owner: Set the owner of the new user group.
-       If not set, the owner is the |authtoken| user.
-   :type owner: Optional(str or int)
-   :param active: Set this group as active.
-   :type active: Optional(``True`` | ``False``)
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg": "created new user group `<groupname>`",
-                 "user_group": <user_group_object>
-               }
-       error:  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "user group `<group name>` already exist"
-       or
-       "failed to create group `<group name>`"
-     }
-
-
-update_user_group
------------------
-
-.. py:function:: update_user_group(apiuser, usergroupid, group_name=<Optional:''>, description=<Optional:''>, owner=<Optional:None>, active=<Optional:True>)
-
-   Updates the specified `user group` with the details provided.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param usergroupid: Set the id of the `user group` to update.
-   :type usergroupid: str or int
-   :param group_name: Set the new name the `user group`
-   :type group_name: str
-   :param description: Give a description for the `user group`
-   :type description: str
-   :param owner: Set the owner of the `user group`.
-   :type owner: Optional(str or int)
-   :param active: Set the group as active.
-   :type active: Optional(``True`` | ``False``)
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       "msg": 'updated user group ID:<user group id> <user group name>',
-       "user_group": <user_group_object>
-     }
-     error :  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "failed to update user group `<user group name>`"
-     }
-
-
-delete_user_group
------------------
-
-.. py:function:: delete_user_group(apiuser, usergroupid)
-
-   Deletes the specified `user group`.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified repository.
-
-   This command takes the following options:
-
-   :param apiuser: filled automatically from apikey
-   :type apiuser: AuthUser
-   :param usergroupid:
-   :type usergroupid: int
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       "msg": "deleted user group ID:<user_group_id> <user_group_name>"
-     }
-     error :  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "failed to delete user group ID:<user_group_id> <user_group_name>"
-       or
-       "RepoGroup assigned to <repo_groups_list>"
-     }
-
-
-add_user_to_user_group
-----------------------
-
-.. py:function:: add_user_to_user_group(apiuser, usergroupid, userid)
-
-   Adds a user to a `user group`. If the user already exists in the group
-   this command will return false.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified user group.
-
-   This command takes the following options:
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param usergroupid: Set the name of the `user group` to which a
-       user will be added.
-   :type usergroupid: int
-   :param userid: Set the `user_id` of the user to add to the group.
-   :type userid: int
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-         "success": True|False # depends on if member is in group
-         "msg": "added member `<username>` to user group `<groupname>` |
-                 User is already in that group"
-
-     }
-     error :  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "failed to add member to user group `<user_group_name>`"
-     }
-
-
-remove_user_from_user_group
----------------------------
-
-.. py:function:: remove_user_from_user_group(apiuser, usergroupid, userid)
-
-   Removes a user from a user group.
-
-   * If the specified user is not in the group, this command will return
-     `false`.
-
-   This command can only be run using an |authtoken| with admin rights to
-   the specified user group.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param usergroupid: Sets the user group name.
-   :type usergroupid: str or int
-   :param userid: The user you wish to remove from |RCE|.
-   :type userid: str or int
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "success":  True|False,  # depends on if member is in group
-                 "msg": "removed member <username> from user group <groupname> |
-                         User wasn't in group"
-               }
-       error:  null
-
-
-grant_user_permission_to_user_group
------------------------------------
-
-.. py:function:: grant_user_permission_to_user_group(apiuser, usergroupid, userid, perm)
-
-   Set permissions for a user in a user group.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param usergroupid: Set the user group to edit permissions on.
-   :type usergroupid: str or int
-   :param userid: Set the user from whom you wish to set permissions.
-   :type userid: str
-   :param perm: (usergroup.(none|read|write|admin))
-   :type perm: str
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       "msg": "Granted perm: `<perm_name>` for user: `<username>` in user group: `<user_group_name>`",
-       "success": true
-     }
-     error :  null
-
-
-revoke_user_permission_from_user_group
---------------------------------------
-
-.. py:function:: revoke_user_permission_from_user_group(apiuser, usergroupid, userid)
-
-   Revoke a users permissions in a user group.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param usergroupid: Set the user group from which to revoke the user
-       permissions.
-   :type: usergroupid: str or int
-   :param userid: Set the userid of the user whose permissions will be
-       revoked.
-   :type userid: str
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       "msg": "Revoked perm for user: `<username>` in user group: `<user_group_name>`",
-       "success": true
-     }
-     error :  null
-
-
-grant_user_group_permission_to_user_group
------------------------------------------
-
-.. py:function:: grant_user_group_permission_to_user_group(apiuser, usergroupid, sourceusergroupid, perm)
-
-   Give one user group permissions to another user group.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param usergroupid: Set the user group on which to edit permissions.
-   :type usergroupid: str or int
-   :param sourceusergroupid: Set the source user group to which
-       access/permissions will be granted.
-   :type sourceusergroupid: str or int
-   :param perm: (usergroup.(none|read|write|admin))
-   :type perm: str
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       "msg": "Granted perm: `<perm_name>` for user group: `<source_user_group_name>` in user group: `<user_group_name>`",
-       "success": true
-     }
-     error :  null
-
-
-revoke_user_group_permission_from_user_group
---------------------------------------------
-
-.. py:function:: revoke_user_group_permission_from_user_group(apiuser, usergroupid, sourceusergroupid)
-
-   Revoke the permissions that one user group has to another.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param usergroupid: Set the user group on which to edit permissions.
-   :type usergroupid: str or int
-   :param sourceusergroupid: Set the user group from which permissions
-       are revoked.
-   :type sourceusergroupid: str or int
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       "msg": "Revoked perm for user group: `<user_group_name>` in user group: `<target_user_group_name>`",
-       "success": true
-     }
-     error :  null
-
-
-get_pull_request
-----------------
-
-.. py:function:: get_pull_request(apiuser, repoid, pullrequestid)
-
-   Get a pull request based on the given ID.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Repository name or repository ID from where the pull
-       request was opened.
-   :type repoid: str or int
-   :param pullrequestid: ID of the requested pull request.
-   :type pullrequestid: int
-
-   Example output:
-
-   .. code-block:: bash
-
-     "id": <id_given_in_input>,
-     "result":
-       {
-           "pull_request_id":   "<pull_request_id>",
-           "url":               "<url>",
-           "title":             "<title>",
-           "description":       "<description>",
-           "status" :           "<status>",
-           "created_on":        "<date_time_created>",
-           "updated_on":        "<date_time_updated>",
-           "commit_ids":        [
-                                    ...
-                                    "<commit_id>",
-                                    "<commit_id>",
-                                    ...
-                                ],
-           "review_status":    "<review_status>",
-           "mergeable":         {
-                                    "status":  "<bool>",
-                                    "message": "<message>",
-                                },
-           "source":            {
-                                    "clone_url":     "<clone_url>",
-                                    "repository":    "<repository_name>",
-                                    "reference":
-                                    {
-                                        "name":      "<name>",
-                                        "type":      "<type>",
-                                        "commit_id": "<commit_id>",
-                                    }
-                                },
-           "target":            {
-                                    "clone_url":   "<clone_url>",
-                                    "repository":    "<repository_name>",
-                                    "reference":
-                                    {
-                                        "name":      "<name>",
-                                        "type":      "<type>",
-                                        "commit_id": "<commit_id>",
-                                    }
-                                },
-          "author":             <user_obj>,
-          "reviewers":          [
-                                    ...
-                                    {
-                                       "user":          "<user_obj>",
-                                       "review_status": "<review_status>",
-                                    }
-                                    ...
-                                ]
-       },
-      "error": null
-
-
-get_pull_requests
------------------
-
-.. py:function:: get_pull_requests(apiuser, repoid, status=<Optional:'new'>)
-
-   Get all pull requests from the repository specified in `repoid`.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Repository name or repository ID.
-   :type repoid: str or int
-   :param status: Only return pull requests with the specified status.
-       Valid options are.
-       * ``new`` (default)
-       * ``open``
-       * ``closed``
-   :type status: str
-
-   Example output:
-
-   .. code-block:: bash
-
-     "id": <id_given_in_input>,
-     "result":
-       [
-           ...
-           {
-               "pull_request_id":   "<pull_request_id>",
-               "url":               "<url>",
-               "title" :            "<title>",
-               "description":       "<description>",
-               "status":            "<status>",
-               "created_on":        "<date_time_created>",
-               "updated_on":        "<date_time_updated>",
-               "commit_ids":        [
-                                        ...
-                                        "<commit_id>",
-                                        "<commit_id>",
-                                        ...
-                                    ],
-               "review_status":    "<review_status>",
-               "mergeable":         {
-                                       "status":      "<bool>",
-                                       "message:      "<message>",
-                                    },
-               "source":            {
-                                        "clone_url":     "<clone_url>",
-                                        "reference":
-                                        {
-                                            "name":      "<name>",
-                                            "type":      "<type>",
-                                            "commit_id": "<commit_id>",
-                                        }
-                                    },
-               "target":            {
-                                        "clone_url":   "<clone_url>",
-                                        "reference":
-                                        {
-                                            "name":      "<name>",
-                                            "type":      "<type>",
-                                            "commit_id": "<commit_id>",
-                                        }
-                                    },
-              "author":             <user_obj>,
-              "reviewers":          [
-                                        ...
-                                        {
-                                           "user":          "<user_obj>",
-                                           "review_status": "<review_status>",
-                                        }
-                                        ...
-                                    ]
-           }
-           ...
-       ],
-     "error": null
-
-
-merge_pull_request
-------------------
-
-.. py:function:: merge_pull_request(apiuser, repoid, pullrequestid, userid=<Optional:<OptionalAttr:apiuser>>)
-
-   Merge the pull request specified by `pullrequestid` into its target
-   repository.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: The Repository name or repository ID of the
-       target repository to which the |pr| is to be merged.
-   :type repoid: str or int
-   :param pullrequestid: ID of the pull request which shall be merged.
-   :type pullrequestid: int
-   :param userid: Merge the pull request as this user.
-   :type userid: Optional(str or int)
-
-   Example output:
-
-   .. code-block:: bash
-
-     "id": <id_given_in_input>,
-     "result":
-       {
-           "executed":         "<bool>",
-           "failure_reason":   "<int>",
-           "merge_commit_id":  "<merge_commit_id>",
-           "possible":         "<bool>"
-       },
-     "error": null
-
-
-close_pull_request
-------------------
-
-.. py:function:: close_pull_request(apiuser, repoid, pullrequestid, userid=<Optional:<OptionalAttr:apiuser>>)
-
-   Close the pull request specified by `pullrequestid`.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Repository name or repository ID to which the pull
-       request belongs.
-   :type repoid: str or int
-   :param pullrequestid: ID of the pull request to be closed.
-   :type pullrequestid: int
-   :param userid: Close the pull request as this user.
-   :type userid: Optional(str or int)
-
-   Example output:
-
-   .. code-block:: bash
-
-     "id": <id_given_in_input>,
-     "result":
-       {
-           "pull_request_id":  "<int>",
-           "closed":           "<bool>"
-       },
-     "error": null
-
-
-comment_pull_request
---------------------
-
-.. py:function:: comment_pull_request(apiuser, repoid, pullrequestid, message=<Optional:None>, status=<Optional:None>, userid=<Optional:<OptionalAttr:apiuser>>)
+.. toctree::
 
-   Comment on the pull request specified with the `pullrequestid`,
-   in the |repo| specified by the `repoid`, and optionally change the
-   review status.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: The repository name or repository ID.
-   :type repoid: str or int
-   :param pullrequestid: The pull request ID.
-   :type pullrequestid: int
-   :param message: The text content of the comment.
-   :type message: str
-   :param status: (**Optional**) Set the approval status of the pull
-       request. Valid options are:
-       * not_reviewed
-       * approved
-       * rejected
-       * under_review
-   :type status: str
-   :param userid: Comment on the pull request as this user
-   :type userid: Optional(str or int)
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result :
-       {
-           "pull_request_id":  "<Integer>",
-           "comment_id":       "<Integer>"
-       }
-     error :  null
-
-
-create_pull_request
--------------------
-
-.. py:function:: create_pull_request(apiuser, source_repo, target_repo, source_ref, target_ref, title, description=<Optional:''>, reviewers=<Optional:None>)
-
-   Creates a new pull request.
-
-   Accepts refs in the following formats:
-
-       * branch:<branch_name>:<sha>
-       * branch:<branch_name>
-       * bookmark:<bookmark_name>:<sha> (Mercurial only)
-       * bookmark:<bookmark_name> (Mercurial only)
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param source_repo: Set the source repository name.
-   :type source_repo: str
-   :param target_repo: Set the target repository name.
-   :type target_repo: str
-   :param source_ref: Set the source ref name.
-   :type source_ref: str
-   :param target_ref: Set the target ref name.
-   :type target_ref: str
-   :param title: Set the pull request title.
-   :type title: str
-   :param description: Set the pull request description.
-   :type description: Optional(str)
-   :param reviewers: Set the new pull request reviewers list.
-   :type reviewers: Optional(list)
-
-
-update_pull_request
--------------------
-
-.. py:function:: update_pull_request(apiuser, repoid, pullrequestid, title=<Optional:''>, description=<Optional:''>, reviewers=<Optional:None>, update_commits=<Optional:None>, close_pull_request=<Optional:None>)
-
-   Updates a pull request.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: The repository name or repository ID.
-   :type repoid: str or int
-   :param pullrequestid: The pull request ID.
-   :type pullrequestid: int
-   :param title: Set the pull request title.
-   :type title: str
-   :param description: Update pull request description.
-   :type description: Optional(str)
-   :param reviewers: Update pull request reviewers list with new value.
-   :type reviewers: Optional(list)
-   :param update_commits: Trigger update of commits for this pull request
-   :type: update_commits: Optional(bool)
-   :param close_pull_request: Close this pull request with rejected state
-   :type: close_pull_request: Optional(bool)
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result :
-       {
-           "msg": "Updated pull request `63`",
-           "pull_request": <pull_request_object>,
-           "updated_reviewers": {
-             "added": [
-               "username"
-             ],
-             "removed": []
-           },
-           "updated_commits": {
-             "added": [
-               "<sha1_hash>"
-             ],
-             "common": [
-               "<sha1_hash>",
-               "<sha1_hash>",
-             ],
-             "removed": []
-           }
-       }
-     error :  null
-
-
-get_repo
---------
-
-.. py:function:: get_repo(apiuser, repoid, cache=<Optional:True>)
-
-   Gets an existing repository by its name or repository_id.
-
-   The members section so the output returns users groups or users
-   associated with that repository.
-
-   This command can only be run using an |authtoken| with admin rights,
-   or users with at least read rights to the |repo|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: The repository name or repository id.
-   :type repoid: str or int
-   :param cache: use the cached value for last changeset
-   :type: cache: Optional(bool)
-
-   Example output:
-
-   .. code-block:: bash
-
-       {
-         "error": null,
-         "id": <repo_id>,
-         "result": {
-           "clone_uri": null,
-           "created_on": "timestamp",
-           "description": "repo description",
-           "enable_downloads": false,
-           "enable_locking": false,
-           "enable_statistics": false,
-           "followers": [
-             {
-               "active": true,
-               "admin": false,
-               "api_key": "****************************************",
-               "api_keys": [
-                 "****************************************"
-               ],
-               "email": "[e-mail]",
-               "emails": [
-                 "[e-mail]"
-               ],
-               "extern_name": "rhodecode",
-               "extern_type": "rhodecode",
-               "firstname": "username",
-               "ip_addresses": [],
-               "language": null,
-               "last_login": "2015-09-16T17:16:35.854",
-               "lastname": "surname",
-               "user_id": <user_id>,
-               "username": "name"
-             }
-           ],
-           "fork_of": "parent-repo",
-           "landing_rev": [
-             "rev",
-             "tip"
-           ],
-           "last_changeset": {
-             "author": "User <[e-mail]>",
-             "branch": "default",
-             "date": "timestamp",
-             "message": "last commit message",
-             "parents": [
-               {
-                 "raw_id": "commit-id"
-               }
-             ],
-             "raw_id": "commit-id",
-             "revision": <revision number>,
-             "short_id": "short id"
-           },
-           "lock_reason": null,
-           "locked_by": null,
-           "locked_date": null,
-           "members": [
-             {
-               "name": "super-admin-name",
-               "origin": "super-admin",
-               "permission": "repository.admin",
-               "type": "user"
-             },
-             {
-               "name": "owner-name",
-               "origin": "owner",
-               "permission": "repository.admin",
-               "type": "user"
-             },
-             {
-               "name": "user-group-name",
-               "origin": "permission",
-               "permission": "repository.write",
-               "type": "user_group"
-             }
-           ],
-           "owner": "owner-name",
-           "permissions": [
-             {
-               "name": "super-admin-name",
-               "origin": "super-admin",
-               "permission": "repository.admin",
-               "type": "user"
-             },
-             {
-               "name": "owner-name",
-               "origin": "owner",
-               "permission": "repository.admin",
-               "type": "user"
-             },
-             {
-               "name": "user-group-name",
-               "origin": "permission",
-               "permission": "repository.write",
-               "type": "user_group"
-             }
-           ],
-           "private": true,
-           "repo_id": 676,
-           "repo_name": "user-group/repo-name",
-           "repo_type": "hg"
-         }
-       }
-
-
-get_repos
----------
-
-.. py:function:: get_repos(apiuser)
-
-   Lists all existing repositories.
-
-   This command can only be run using an |authtoken| with admin rights,
-   or users with at least read rights to |repos|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: [
-                 {
-                   "repo_id" :          "<repo_id>",
-                   "repo_name" :        "<reponame>"
-                   "repo_type" :        "<repo_type>",
-                   "clone_uri" :        "<clone_uri>",
-                   "private": :         "<bool>",
-                   "created_on" :       "<datetimecreated>",
-                   "description" :      "<description>",
-                   "landing_rev":       "<landing_rev>",
-                   "owner":             "<repo_owner>",
-                   "fork_of":           "<name_of_fork_parent>",
-                   "enable_downloads":  "<bool>",
-                   "enable_locking":    "<bool>",
-                   "enable_statistics": "<bool>",
-                 },
-                 ...
-               ]
-       error:  null
-
-
-get_repo_changeset
-------------------
-
-.. py:function:: get_repo_changeset(apiuser, repoid, revision, details=<Optional:'basic'>)
-
-   Returns information about a changeset.
-
-   Additionally parameters define the amount of details returned by
-   this function.
-
-   This command can only be run using an |authtoken| with admin rights,
-   or users with at least read rights to the |repo|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: The repository name or repository id
-   :type repoid: str or int
-   :param revision: revision for which listing should be done
-   :type revision: str
-   :param details: details can be 'basic|extended|full' full gives diff
-       info details like the diff itself, and number of changed files etc.
-   :type details: Optional(str)
-
-
-get_repo_changesets
--------------------
-
-.. py:function:: get_repo_changesets(apiuser, repoid, start_rev, limit, details=<Optional:'basic'>)
-
-   Returns a set of changesets limited by the number of commits starting
-   from the `start_rev` option.
-
-   Additional parameters define the amount of details returned by this
-   function.
-
-   This command can only be run using an |authtoken| with admin rights,
-   or users with at least read rights to |repos|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: The repository name or repository ID.
-   :type repoid: str or int
-   :param start_rev: The starting revision from where to get changesets.
-   :type start_rev: str
-   :param limit: Limit the number of changesets to this amount
-   :type limit: str or int
-   :param details: Set the level of detail returned. Valid option are:
-       ``basic``, ``extended`` and ``full``.
-   :type details: Optional(str)
-
-   .. note::
-
-      Setting the parameter `details` to the value ``full`` is extensive
-      and returns details like the diff itself, and the number
-      of changed files.
-
-
-get_repo_nodes
---------------
-
-.. py:function:: get_repo_nodes(apiuser, repoid, revision, root_path, ret_type=<Optional:'all'>, details=<Optional:'basic'>)
-
-   Returns a list of nodes and children in a flat list for a given
-   path at given revision.
-
-   It's possible to specify ret_type to show only `files` or `dirs`.
-
-   This command can only be run using an |authtoken| with admin rights,
-   or users with at least read rights to |repos|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: The repository name or repository ID.
-   :type repoid: str or int
-   :param revision: The revision for which listing should be done.
-   :type revision: str
-   :param root_path: The path from which to start displaying.
-   :type root_path: str
-   :param ret_type: Set the return type. Valid options are
-       ``all`` (default), ``files`` and ``dirs``.
-   :type ret_type: Optional(str)
-   :param details: Returns extended information about nodes, such as
-       md5, binary, and or content.  The valid options are ``basic`` and
-       ``full``.
-   :type details: Optional(str)
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: [
-                 {
-                   "name" : "<name>"
-                   "type" : "<type>",
-                   "binary": "<true|false>" (only in extended mode)
-                   "md5"  : "<md5 of file content>" (only in extended mode)
-                 },
-                 ...
-               ]
-       error:  null
-
-
-create_repo
------------
-
-.. py:function:: create_repo(apiuser, repo_name, repo_type, owner=<Optional:<OptionalAttr:apiuser>>, description=<Optional:''>, private=<Optional:False>, clone_uri=<Optional:None>, landing_rev=<Optional:'rev:tip'>, enable_statistics=<Optional:False>, enable_locking=<Optional:False>, enable_downloads=<Optional:False>, copy_permissions=<Optional:False>)
-
-   Creates a repository.
-
-   * If the repository name contains "/", all the required repository
-     groups will be created.
-
-     For example "foo/bar/baz" will create |repo| groups "foo" and "bar"
-     (with "foo" as parent). It will also create the "baz" repository
-     with "bar" as |repo| group.
-
-   This command can only be run using an |authtoken| with at least
-   write permissions to the |repo|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repo_name: Set the repository name.
-   :type repo_name: str
-   :param repo_type: Set the repository type; 'hg','git', or 'svn'.
-   :type repo_type: str
-   :param owner: user_id or username
-   :type owner: Optional(str)
-   :param description: Set the repository description.
-   :type description: Optional(str)
-   :param private:
-   :type private: bool
-   :param clone_uri:
-   :type clone_uri: str
-   :param landing_rev: <rev_type>:<rev>
-   :type landing_rev: str
-   :param enable_locking:
-   :type enable_locking: bool
-   :param enable_downloads:
-   :type enable_downloads: bool
-   :param enable_statistics:
-   :type enable_statistics: bool
-   :param copy_permissions: Copy permission from group in which the
-       repository is being created.
-   :type copy_permissions: bool
-
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg": "Created new repository `<reponame>`",
-                 "success": true,
-                 "task": "<celery task id or None if done sync>"
-               }
-       error:  null
-
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-        'failed to create repository `<repo_name>`
-     }
-
-
-add_field_to_repo
------------------
-
-.. py:function:: add_field_to_repo(apiuser, repoid, key, label=<Optional:''>, description=<Optional:''>)
-
-   Adds an extra field to a repository.
-
-   This command can only be run using an |authtoken| with at least
-   write permissions to the |repo|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Set the repository name or repository id.
-   :type repoid: str or int
-   :param key: Create a unique field key for this repository.
-   :type key: str
-   :param label:
-   :type label: Optional(str)
-   :param description:
-   :type description: Optional(str)
-
-
-remove_field_from_repo
-----------------------
-
-.. py:function:: remove_field_from_repo(apiuser, repoid, key)
-
-   Removes an extra field from a repository.
-
-   This command can only be run using an |authtoken| with at least
-   write permissions to the |repo|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Set the repository name or repository ID.
-   :type repoid: str or int
-   :param key: Set the unique field key for this repository.
-   :type key: str
-
-
-update_repo
------------
-
-.. py:function:: update_repo(apiuser, repoid, name=<Optional:None>, owner=<Optional:<OptionalAttr:apiuser>>, group=<Optional:None>, fork_of=<Optional:None>, description=<Optional:''>, private=<Optional:False>, clone_uri=<Optional:None>, landing_rev=<Optional:'rev:tip'>, enable_statistics=<Optional:False>, enable_locking=<Optional:False>, enable_downloads=<Optional:False>, fields=<Optional:''>)
-
-   Updates a repository with the given information.
-
-   This command can only be run using an |authtoken| with at least
-   write permissions to the |repo|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: repository name or repository ID.
-   :type repoid: str or int
-   :param name: Update the |repo| name.
-   :type name: str
-   :param owner: Set the |repo| owner.
-   :type owner: str
-   :param group: Set the |repo| group the |repo| belongs to.
-   :type group: str
-   :param fork_of: Set the master |repo| name.
-   :type fork_of: str
-   :param description: Update the |repo| description.
-   :type description: str
-   :param private: Set the |repo| as private. (True | False)
-   :type private: bool
-   :param clone_uri: Update the |repo| clone URI.
-   :type clone_uri: str
-   :param landing_rev: Set the |repo| landing revision. Default is
-       ``tip``.
-   :type landing_rev: str
-   :param enable_statistics: Enable statistics on the |repo|,
-       (True | False).
-   :type enable_statistics: bool
-   :param enable_locking: Enable |repo| locking.
-   :type enable_locking: bool
-   :param enable_downloads: Enable downloads from the |repo|,
-       (True | False).
-   :type enable_downloads: bool
-   :param fields: Add extra fields to the |repo|. Use the following
-       example format: ``field_key=field_val,field_key2=fieldval2``.
-       Escape ', ' with \,
-   :type fields: str
-
-
-fork_repo
----------
-
-.. py:function:: fork_repo(apiuser, repoid, fork_name, owner=<Optional:<OptionalAttr:apiuser>>, description=<Optional:''>, copy_permissions=<Optional:False>, private=<Optional:False>, landing_rev=<Optional:'rev:tip'>)
-
-   Creates a fork of the specified |repo|.
-
-   * If using |RCE| with Celery this will immediately return a success
-     message, even though the fork will be created asynchronously.
-
-   This command can only be run using an |authtoken| with fork
-   permissions on the |repo|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Set repository name or repository ID.
-   :type repoid: str or int
-   :param fork_name: Set the fork name.
-   :type fork_name: str
-   :param owner: Set the fork owner.
-   :type owner: str
-   :param description: Set the fork descripton.
-   :type description: str
-   :param copy_permissions: Copy permissions from parent |repo|. The
-       default is False.
-   :type copy_permissions: bool
-   :param private: Make the fork private. The default is False.
-   :type private: bool
-   :param landing_rev: Set the landing revision. The default is tip.
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_for_response>
-       api_key : "<api_key>"
-       args:     {
-                   "repoid" :          "<reponame or repo_id>",
-                   "fork_name":        "<forkname>",
-                   "owner":            "<username or user_id = Optional(=apiuser)>",
-                   "description":      "<description>",
-                   "copy_permissions": "<bool>",
-                   "private":          "<bool>",
-                   "landing_rev":      "<landing_rev>"
-                 }
-
-   Example error output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg": "Created fork of `<reponame>` as `<forkname>`",
-                 "success": true,
-                 "task": "<celery task id or None if done sync>"
-               }
-       error:  null
-
-
-delete_repo
------------
-
-.. py:function:: delete_repo(apiuser, repoid, forks=<Optional:''>)
-
-   Deletes a repository.
-
-   * When the `forks` parameter is set it's possible to detach or delete
-     forks of deleted repository.
-
-   This command can only be run using an |authtoken| with admin
-   permissions on the |repo|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Set the repository name or repository ID.
-   :type repoid: str or int
-   :param forks: Set to `detach` or `delete` forks from the |repo|.
-   :type forks: Optional(str)
-
-   Example error output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg": "Deleted repository `<reponame>`",
-                 "success": true
-               }
-       error:  null
-
-
-comment_commit
---------------
-
-.. py:function:: comment_commit(apiuser, repoid, commit_id, message, userid=<Optional:<OptionalAttr:apiuser>>, status=<Optional:None>)
-
-   Set a commit comment, and optionally change the status of the commit.
-   This command can be executed only using api_key belonging to user
-   with admin rights, or repository administrator.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Set the repository name or repository ID.
-   :type repoid: str or int
-   :param commit_id: Specify the commit_id for which to set a comment.
-   :type commit_id: str
-   :param message: The comment text.
-   :type message: str
-   :param userid: Set the user name of the comment creator.
-   :type userid: Optional(str or int)
-   :param status: status, one of 'not_reviewed', 'approved', 'rejected',
-      'under_review'
-   :type status: str
-
-   Example error output:
-
-   .. code-block:: json
-
-       {
-           "id" : <id_given_in_input>,
-           "result" : {
-               "msg": "Commented on commit `<commit_id>` for repository `<repoid>`",
-               "status_change": null or <status>,
-               "success": true
-           },
-           "error" :  null
-       }
-
-
-changeset_comment
------------------
-
-.. py:function:: changeset_comment(apiuser, repoid, revision, message, userid=<Optional:<OptionalAttr:apiuser>>, status=<Optional:None>)
-
-   .. deprecated:: 3.4.0
-
-      Please use method `comment_commit` instead.
-
-
-   Set a changeset comment, and optionally change the status of the
-   changeset.
-
-   This command can only be run using an |authtoken| with admin
-   permissions on the |repo|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Set the repository name or repository ID.
-   :type repoid: str or int
-   :param revision: Specify the revision for which to set a comment.
-   :type revision: str
-   :param message: The comment text.
-   :type message: str
-   :param userid: Set the user name of the comment creator.
-   :type userid: Optional(str or int)
-   :param status: Set the comment status. The following are valid options:
-       * not_reviewed
-       * approved
-       * rejected
-       * under_review
-   :type status: str
-
-   Example error output:
-
-   .. code-block:: json
-
-       {
-           "id" : <id_given_in_input>,
-           "result" : {
-               "msg": "Commented on commit `<revision>` for repository `<repoid>`",
-               "status_change": null or <status>,
-               "success": true
-           },
-           "error" : null
-       }
-
-
-grant_user_permission
----------------------
-
-.. py:function:: grant_user_permission(apiuser, repoid, userid, perm)
-
-   Grant permissions for the specified user on the given repository,
-   or update existing permissions if found.
-
-   This command can only be run using an |authtoken| with admin
-   permissions on the |repo|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Set the repository name or repository ID.
-   :type repoid: str or int
-   :param userid: Set the user name.
-   :type userid: str
-   :param perm: Set the user permissions, using the following format
-       ``(repository.(none|read|write|admin))``
-   :type perm: str
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg" : "Granted perm: `<perm>` for user: `<username>` in repo: `<reponame>`",
-                 "success": true
-               }
-       error:  null
-
-
-revoke_user_permission
-----------------------
-
-.. py:function:: revoke_user_permission(apiuser, repoid, userid)
-
-   Revoke permission for a user on the specified repository.
-
-   This command can only be run using an |authtoken| with admin
-   permissions on the |repo|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Set the repository name or repository ID.
-   :type repoid: str or int
-   :param userid: Set the user name of revoked user.
-   :type userid: str or int
-
-   Example error output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg" : "Revoked perm for user: `<username>` in repo: `<reponame>`",
-                 "success": true
-               }
-       error:  null
-
-
-grant_user_group_permission
----------------------------
-
-.. py:function:: grant_user_group_permission(apiuser, repoid, usergroupid, perm)
-
-   Grant permission for a user group on the specified repository,
-   or update existing permissions.
-
-   This command can only be run using an |authtoken| with admin
-   permissions on the |repo|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Set the repository name or repository ID.
-   :type repoid: str or int
-   :param usergroupid: Specify the ID of the user group.
-   :type usergroupid: str or int
-   :param perm: Set the user group permissions using the following
-       format: (repository.(none|read|write|admin))
-   :type perm: str
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       "msg" : "Granted perm: `<perm>` for group: `<usersgroupname>` in repo: `<reponame>`",
-       "success": true
-
-     }
-     error :  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "failed to edit permission for user group: `<usergroup>` in repo `<repo>`'
-     }
-
-
-revoke_user_group_permission
-----------------------------
-
-.. py:function:: revoke_user_group_permission(apiuser, repoid, usergroupid)
-
-   Revoke the permissions of a user group on a given repository.
-
-   This command can only be run using an |authtoken| with admin
-   permissions on the |repo|.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repoid: Set the repository name or repository ID.
-   :type repoid: str or int
-   :param usergroupid: Specify the user group ID.
-   :type usergroupid: str or int
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg" : "Revoked perm for group: `<usersgroupname>` in repo: `<reponame>`",
-                 "success": true
-               }
-       error:  null
-
-
-get_repo_group
---------------
-
-.. py:function:: get_repo_group(apiuser, repogroupid)
-
-   Return the specified |repo| group, along with permissions,
-   and repositories inside the group
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repogroupid: Specify the name of ID of the repository group.
-   :type repogroupid: str or int
-
-
-   Example output:
-
-   .. code-block:: bash
-
-       {
-         "error": null,
-         "id": repo-group-id,
-         "result": {
-           "group_description": "repo group description",
-           "group_id": 14,
-           "group_name": "group name",
-           "members": [
-             {
-               "name": "super-admin-username",
-               "origin": "super-admin",
-               "permission": "group.admin",
-               "type": "user"
-             },
-             {
-               "name": "owner-name",
-               "origin": "owner",
-               "permission": "group.admin",
-               "type": "user"
-             },
-             {
-               "name": "user-group-name",
-               "origin": "permission",
-               "permission": "group.write",
-               "type": "user_group"
-             }
-           ],
-           "owner": "owner-name",
-           "parent_group": null,
-           "repositories": [ repo-list ]
-         }
-       }
-
-
-get_repo_groups
----------------
-
-.. py:function:: get_repo_groups(apiuser)
-
-   Returns all repository groups.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-
-
-create_repo_group
------------------
-
-.. py:function:: create_repo_group(apiuser, group_name, description=<Optional:''>, owner=<Optional:<OptionalAttr:apiuser>>, copy_permissions=<Optional:False>)
-
-   Creates a repository group.
-
-   * If the repository group name contains "/", all the required repository
-     groups will be created.
-
-     For example "foo/bar/baz" will create |repo| groups "foo" and "bar"
-     (with "foo" as parent). It will also create the "baz" repository
-     with "bar" as |repo| group.
-
-   This command can only be run using an |authtoken| with admin
-   permissions.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param group_name: Set the repository group name.
-   :type group_name: str
-   :param description: Set the |repo| group description.
-   :type description: str
-   :param owner: Set the |repo| group owner.
-   :type owner: str
-   :param copy_permissions:
-   :type copy_permissions:
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-         "msg": "Created new repo group `<repo_group_name>`"
-         "repo_group": <repogroup_object>
-     }
-     error :  null
-
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       failed to create repo group `<repogroupid>`
-     }
-
-
-update_repo_group
------------------
-
-.. py:function:: update_repo_group(apiuser, repogroupid, group_name=<Optional:''>, description=<Optional:''>, owner=<Optional:<OptionalAttr:apiuser>>, parent=<Optional:None>, enable_locking=<Optional:False>)
-
-   Updates repository group with the details given.
-
-   This command can only be run using an |authtoken| with admin
-   permissions.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repogroupid: Set the ID of repository group.
-   :type repogroupid: str or int
-   :param group_name: Set the name of the |repo| group.
-   :type group_name: str
-   :param description: Set a description for the group.
-   :type description: str
-   :param owner: Set the |repo| group owner.
-   :type owner: str
-   :param parent: Set the |repo| group parent.
-   :type parent: str or int
-   :param enable_locking: Enable |repo| locking. The default is false.
-   :type enable_locking: bool
-
-
-delete_repo_group
------------------
-
-.. py:function:: delete_repo_group(apiuser, repogroupid)
-
-   Deletes a |repo| group.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repogroupid: Set the name or ID of repository group to be
-       deleted.
-   :type repogroupid: str or int
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       'msg': 'deleted repo group ID:<repogroupid> <repogroupname>
-       'repo_group': null
-     }
-     error :  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "failed to delete repo group ID:<repogroupid> <repogroupname>"
-     }
-
-
-grant_user_permission_to_repo_group
------------------------------------
-
-.. py:function:: grant_user_permission_to_repo_group(apiuser, repogroupid, userid, perm, apply_to_children=<Optional:'none'>)
-
-   Grant permission for a user on the given repository group, or update
-   existing permissions if found.
-
-   This command can only be run using an |authtoken| with admin
-   permissions.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repogroupid: Set the name or ID of repository group.
-   :type repogroupid: str or int
-   :param userid: Set the user name.
-   :type userid: str
-   :param perm: (group.(none|read|write|admin))
-   :type perm: str
-   :param apply_to_children: 'none', 'repos', 'groups', 'all'
-   :type apply_to_children: str
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg" : "Granted perm: `<perm>` (recursive:<apply_to_children>) for user: `<username>` in repo group: `<repo_group_name>`",
-                 "success": true
-               }
-       error:  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "failed to edit permission for user: `<userid>` in repo group: `<repo_group_name>`"
-     }
-
-
-revoke_user_permission_from_repo_group
---------------------------------------
-
-.. py:function:: revoke_user_permission_from_repo_group(apiuser, repogroupid, userid, apply_to_children=<Optional:'none'>)
-
-   Revoke permission for a user in a given repository group.
-
-   This command can only be run using an |authtoken| with admin
-   permissions on the |repo| group.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repogroupid: Set the name or ID of the repository group.
-   :type repogroupid: str or int
-   :param userid: Set the user name to revoke.
-   :type userid: str
-   :param apply_to_children: 'none', 'repos', 'groups', 'all'
-   :type apply_to_children: str
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg" : "Revoked perm (recursive:<apply_to_children>) for user: `<username>` in repo group: `<repo_group_name>`",
-                 "success": true
-               }
-       error:  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "failed to edit permission for user: `<userid>` in repo group: `<repo_group_name>`"
-     }
-
-
-grant_user_group_permission_to_repo_group
------------------------------------------
-
-.. py:function:: grant_user_group_permission_to_repo_group(apiuser, repogroupid, usergroupid, perm, apply_to_children=<Optional:'none'>)
-
-   Grant permission for a user group on given repository group, or update
-   existing permissions if found.
-
-   This command can only be run using an |authtoken| with admin
-   permissions on the |repo| group.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repogroupid: Set the name or id of repository group
-   :type repogroupid: str or int
-   :param usergroupid: id of usergroup
-   :type usergroupid: str or int
-   :param perm: (group.(none|read|write|admin))
-   :type perm: str
-   :param apply_to_children: 'none', 'repos', 'groups', 'all'
-   :type apply_to_children: str
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       "msg" : "Granted perm: `<perm>` (recursive:<apply_to_children>) for user group: `<usersgroupname>` in repo group: `<repo_group_name>`",
-       "success": true
-
-     }
-     error :  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "failed to edit permission for user group: `<usergroup>` in repo group: `<repo_group_name>`"
-     }
-
-
-revoke_user_group_permission_from_repo_group
---------------------------------------------
-
-.. py:function:: revoke_user_group_permission_from_repo_group(apiuser, repogroupid, usergroupid, apply_to_children=<Optional:'none'>)
-
-   Revoke permission for user group on given repository.
-
-   This command can only be run using an |authtoken| with admin
-   permissions on the |repo| group.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param repogroupid: name or id of repository group
-   :type repogroupid: str or int
-   :param usergroupid:
-   :param apply_to_children: 'none', 'repos', 'groups', 'all'
-   :type apply_to_children: str
-
-   Example output:
-
-   .. code-block:: bash
-
-       id : <id_given_in_input>
-       result: {
-                 "msg" : "Revoked perm (recursive:<apply_to_children>) for user group: `<usersgroupname>` in repo group: `<repo_group_name>`",
-                 "success": true
-               }
-       error:  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "failed to edit permission for user group: `<usergroup>` in repo group: `<repo_group_name>`"
-     }
-
-
-get_gist
---------
-
-.. py:function:: get_gist(apiuser, gistid, content=<Optional:False>)
-
-   Get the specified gist, based on the gist ID.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param gistid: Set the id of the private or public gist
-   :type gistid: str
-   :param content: Return the gist content. Default is false.
-   :type content: Optional(bool)
-
-
-get_gists
----------
-
-.. py:function:: get_gists(apiuser, userid=<Optional:<OptionalAttr:apiuser>>)
-
-   Get all gists for given user. If userid is empty returned gists
-   are for user who called the api
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param userid: user to get gists for
-   :type userid: Optional(str or int)
-
-
-create_gist
------------
-
-.. py:function:: create_gist(apiuser, files, owner=<Optional:<OptionalAttr:apiuser>>, gist_type=<Optional:u'public'>, lifetime=<Optional:-1>, acl_level=<Optional:u'acl_public'>, description=<Optional:''>)
-
-   Creates a new Gist.
-
-   :param apiuser: This is filled automatically from the |authtoken|.
-   :type apiuser: AuthUser
-   :param files: files to be added to the gist. The data structure has
-       to match the following example::
-
-         {'filename': {'content':'...', 'lexer': null},
-          'filename2': {'content':'...', 'lexer': null}}
-
-   :type files: dict
-   :param owner: Set the gist owner, defaults to api method caller
-   :type owner: Optional(str or int)
-   :param gist_type: type of gist ``public`` or ``private``
-   :type gist_type: Optional(str)
-   :param lifetime: time in minutes of gist lifetime
-   :type lifetime: Optional(int)
-   :param acl_level: acl level for this gist, can be
-       ``acl_public`` or ``acl_private`` If the value is set to
-       ``acl_private`` only logged in users are able to access this gist.
-       If not set it defaults to ``acl_public``.
-   :type acl_level: Optional(str)
-   :param description: gist description
-   :type description: Optional(str)
-
-   Example  output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       "msg": "created new gist",
-       "gist": {}
-     }
-     error :  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "failed to create gist"
-     }
-
-
-delete_gist
------------
-
-.. py:function:: delete_gist(apiuser, gistid)
-
-   Deletes existing gist
-
-   :param apiuser: filled automatically from apikey
-   :type apiuser: AuthUser
-   :param gistid: id of gist to delete
-   :type gistid: str
-
-   Example output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : {
-       "deleted gist ID: <gist_id>",
-       "gist": null
-     }
-     error :  null
-
-   Example error output:
-
-   .. code-block:: bash
-
-     id : <id_given_in_input>
-     result : null
-     error :  {
-       "failed to delete gist ID:<gist_id>"
-     }
-
+   methods/license-methods
+   methods/deprecated-methods
+   methods/gist-methods
+   methods/pull-request-methods
+   methods/repo-methods
+   methods/repo-group-methods
+   methods/server-methods
+   methods/user-methods
+   methods/user-group-methods

docs/code-review/code-review.rst

@@ -14,7 +14,7 b' code review matters, see these posts on '
 
 You can also use the |RCE| API set up continuous integration servers to leave
 comments from a test suite. See the :ref:`api` and
-:ref:`integrations-ref` sections for examples on how to set this up.
+:ref:`extensions-hooks-ref` sections for examples on how to set this up.
 
 .. toctree::
 

docs/common.py

@@ -6,6 +6,8 b" rst_epilog = '''"
 .. |AE| replace:: Appenlight
 .. |authtoken| replace:: Authentication Token
 .. |authtokens| replace:: **Auth Tokens**
+.. |RCCEshort| replace:: Community
+.. |RCEEshort| replace:: Enterprise
 .. |git| replace:: Git
 .. |hg| replace:: Mercurial
 .. |svn| replace:: Subversion

docs/contributing/dev-setup.rst

@@ -78,7 +78,7 b' following command from inside the cloned'
 
    On the first run, this will take a while to download and optionally compile
    a few things. The following runs will be faster. The development shell works
-   fine on MacOS and Linux platforms.
+   fine on both MacOS and Linux platforms.
 
 
 
@@ -91,9 +91,9 b' use the following steps:'
 1. Create a copy of `~/rhodecode-enterprise-ce/configs/development.ini`
 2. Adjust the configuration settings to your needs
 
-   .. note::
+.. note::
 
-      It is recommended to use the name `dev.ini`.
+  It is recommended to use the name `dev.ini`.
 
 
 Setup the Development Database
@@ -108,32 +108,37 b' time operation::'
         --repos=~/my_dev_repos
 
 
+Compile CSS and JavaScript
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To use the application's frontend, you will need to compile the CSS and
+JavaScript with Grunt. This is easily done from within the nix-shell using the
+following command::
+
+    make web-build
+
+You will need to recompile following any changes made to the CSS or JavaScript
+files.
+
+
 Start the Development Server
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-When starting the development server, you should start the vcsserver as a
-separate process. To do this, use one of the following examples:
+From the rhodecode-vcsserver directory, start the development server in another
+nix-shell, using the following command::
 
-1. Set the `start.vcs_server` flag in the ``dev.ini`` file to true. For example:
+      pserve configs/development.ini http_port=9900
 
-   .. code-block:: python
+In the adjacent nix-shell which you created for your development server, you may
+now start CE with the following command::
 
-      ### VCS CONFIG ###
-      ##################
-      vcs.start_server = true
-      vcs.server = localhost:9900
-      vcs.server.log_level = debug
 
-   Then start the server using the following command: ``rcserver dev.ini``
+      rcserver dev.ini
 
-2. Start the development server using the following example::
-
-      rcserver --with-vcsserver dev.ini
+.. note::
 
-3. Start the development server in a different terminal using the following
-   example::
-
-      vcsserver
+  To automatically refresh - and recompile the frontend assets - when changes
+  are made in the source code, you can use the option `--reload`.
 
 
 Run the Environment Tests
@@ -141,4 +146,12 b' Run the Environment Tests'
 
 Please make sure that the tests are passing to verify that your environment is
 set up correctly. RhodeCode uses py.test to run tests.
-Please simply run ``make test`` to run the basic test suite.
+While your instance is running, start a new nix-shell and simply run
+``make test`` to run the basic test suite.
+
+
+Need Help?
+^^^^^^^^^^
+
+Join us on Slack via https://rhodecode.com/join or post questions in our
+Community Portal at https://community.rhodecode.com

docs/contributing/overview.rst

@@ -86,14 +86,11 b' Sign the Contributor License Agreement'
 ======================================
 
 If your contribution is approved, you will need to virtually sign the license
-agreement in order for it to be merged into the project's codebase. You can read
-it on our website here: https://rhodecode.com/static/pdf/RhodeCode-CLA.pdf
+agreement in order for it to be merged into the project's codebase.
 
-To sign, go to code.rhodecode.com
-and clone the CLA repository. Add your name and make a pull request to add it to
-the contributor agreement; this serves as your virtual signature. Once your
-signature is merged, add a link to the relevant commit to your contribution
-pull request.
+You can read it on our website at https://rhodecode.com/rhodecode-cla
+
+To sign electronically, go to https://rhodecode.com/sign-cla
 
 
 

docs/default.nix

@@ -28,10 +28,11 b' let'
   };
 
   Pygments = buildPythonPackage rec {
-    name = "Pygments-2.0.2";
+    name = "Pygments-2.1.3";
+    doCheck = false;
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz";
-      md5 = "238587a1370d62405edabd0794b3ec4a";
+      url = "https://pypi.python.org/packages/b8/67/ab177979be1c81bc99c8d0592ef22d547e70bb4c6815c383286ed5dec504/Pygments-2.1.3.tar.gz";
+      md5 = "ed3fba2467c8afcda4d317e4ef2c6150";
     };
   };
 
@@ -78,11 +79,19 b' let'
     ];
   };
 
-  Sphinx = buildPythonPackage (rec {
-    name = "Sphinx-1.3.1";
+  imagesize = buildPythonPackage rec {
+    name = "imagesize-0.7.1";
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz";
-      md5 = "8786a194acf9673464c5455b11fd4332";
+      url = "https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/${name}.tar.gz";
+      md5 = "976148283286a6ba5f69b0f81aef8052";
+    };
+  };
+
+  Sphinx = buildPythonPackage (rec {
+    name = "Sphinx-1.4.4";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/20/a2/72f44c84f6c4115e3fef58d36d657ec311d80196eab9fd5ec7bcde76143b/${name}.tar.gz";
+      md5 = "64ce2ec08d37ed56313a98232cbe2aee";
     };
     propagatedBuildInputs = [
       docutils
@@ -93,6 +102,7 b' let'
       snowballstemmer
       pytz
       babel
+      imagesize
 
       # TODO: johbo: Had to include it here so that can be imported
       sphinx_rtd_theme

docs/index.rst

@@ -58,6 +58,7 b' and commit files and |repos| while manag'
    collaboration/review-notifications
    collaboration/pull-requests
    code-review/code-review
+   integrations/integrations
 
 .. toctree::
    :maxdepth: 1
@@ -65,7 +66,7 b' and commit files and |repos| while manag'
 
    api/api
    tools/rhodecode-tools
-   integrations/integrations
+   extensions/extensions-hooks
    contributing/contributing
 
 .. toctree::

docs/install/quick-start.rst

@@ -1,7 +1,7 b''
 .. _quick-start:
 
-Quick Start Guide
-=================
+Quick Start Installation Guide
+==============================
 
 .. important::
 

docs/integrations/integrations.rst

@@ -1,25 +1,52 b''
-.. _integrations-ref:
+.. _integrations:
+
+Integrations
+------------
 
-Integrations and Extensions
-===========================
+Rhodecode supports integrations with external services for various events,
+such as commit pushes and pull requests. Multiple integrations of the same type
+can be added at the same time; this is useful for posting different events to
+different Slack channels, for example.
 
-The integrations section references three concepts regularly,
-so to clarify what is meant each time, read the following definitions:
+Supported integrations
+^^^^^^^^^^^^^^^^^^^^^^
 
-* **Plugin**: A Plugin is software that adds a specific feature to
-  an existing software application.
-* **Extension**: An extension extends the capabilities of,
-  or the data available to, an existing software application.
-* **Hook**: A hook intercepts function calls, messages, or events passed
-  between software components and can be used to trigger plugins, or their
-  extensions.
+============================    ============    =====================================
+Type/Name                       |RC| Edition    Description
+============================    ============    =====================================
+:ref:`integrations-slack`       |RCCEshort|     https://slack.com/
+:ref:`integrations-hipchat`     |RCCEshort|     https://www.hipchat.com/
+:ref:`integrations-webhook`     |RCCEshort|     POST events as `json` to a custom url
+:ref:`integrations-email`       |RCEEshort|     Send repo push commits by email
+:ref:`integrations-redmine`     |RCEEshort|     Close/Resolve/Reference redmine issues
+:ref:`integrations-jira`        |RCEEshort|     Close/Resolve/Reference JIRA issues
+============================    ============    =====================================
+
+.. _creating-integrations:
+
+Creating an Integration
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Integrations can be added globally via the admin UI:
+
+:menuselection:`Admin --> Integrations`
+
+or per repository in each repository's settings:
+
+:menuselection:`Admin --> Repositories --> Edit --> Integrations`
+
+To create an integration, select the type from the list in the *Create New
+Integration* section.
+
+The *Current Integrations* section shows existing integrations that have been
+created along with their type (eg. Slack) and enabled status.
+
+See pages specific to each type of integration for more instructions:
 
 .. toctree::
 
-   rcx
-   install-ext
-   config-ext
-   extensions
-   hooks
-   full-blown-example
-   int-slack
+   slack
+   hipchat
+   redmine
+   jira
+   webhook

docs/issue-trackers/issue-trackers.rst

@@ -5,12 +5,12 b' Issue Tracker Integration'
 
 You can set an issue tracker connection in two ways with |RCE|.
 
-* At instance level you can set a default issue tracker.
-* At |repo| level you can configure an integration with a different issue
+* At the instance level, you can set a default issue tracker.
+* At the |repo| level, you can configure an integration with a different issue
   tracker.
 
-To integrate |RCM| with an issue tracker you need to define a regular
-expression that will fetch the issue ID stored in commit messages and replace
+To integrate |RCM| with an issue tracker, you need to define a regular
+expression that will fetch the issue ID stored in commit messages, and replace
 it with a URL. This enables |RCE| to generate a link matching each issue to the
 target |repo|.
 
@@ -33,9 +33,8 b' 3. Select **Add** so save the rule to yo'
 Repository Issue Tracker Configuration
 --------------------------------------
 
-You can configure specific |repos| to use a different issue tracker if
-you need to connect to a non-default one. See the instructions in
-:ref:`repo-it`
+You can configure specific |repos| to use a different issue tracker than the
+default one. See the instructions in :ref:`repo-it`
 
 .. _issue-tr-eg-ref:
 

docs/release-notes/release-notes-4.2.1.rst

@@ -9,6 +9,6 b' Release Date'
 Fixes
 ^^^^^
 
-- ui: fixed empty labels caused by missing translation of JS components
-- login: fixed bad routing URL in comments when user is not logged in.
-- celery: make sure to run tasks in sync mode if connection to celery is lost.
+- UI: fixed empty labels caused by missing translation of JS components.
+- Login: fixed bad routing URL in comments when user is not logged in.
+- Celery: make sure to run tasks in sync mode if connection to celery is lost.

docs/release-notes/release-notes.rst

@@ -9,6 +9,7 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.3.0.rst
    release-notes-4.2.1.rst
    release-notes-4.2.0.rst
    release-notes-4.1.2.rst

docs/tools/tools-cli.rst

@@ -301,7 +301,7 b' used to send signals to build-bots such '
 
     \ - -plugins
          Add plugins to your |RCE| installation. See the
-         :ref:`integrations-ref` section for more details.
+         :ref:`extensions-hooks-ref` section for more details.
 
     \ - -version
          Display your |RCT| version.

pkgs/patch-rhodecode-tools-setup.diff

@@ -1,12 +1,12 b''
 diff --git a/requirements.txt b/requirements.txt
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -3,7 +3,7 @@future==0.14.3
+@@ -3,7 +3,7 @@ future==0.14.3
  six==1.9.0
  mako==1.0.1
  markupsafe==0.23
 -requests==2.5.1
 +requests
- #responses
  whoosh==2.7.0
- elasticsearch==2.3.0
  No newline at end of file
+ elasticsearch==2.3.0
+ elasticsearch-dsl==2.0.0
  No newline at end of file

pkgs/python-packages-overrides.nix

@@ -95,6 +95,14 b' self: super: {'
     };
   });
 
+  py-gfm = super.py-gfm.override  {
+    src = pkgs.fetchgit {
+      url = "https://code.rhodecode.com/upstream/py-gfm";
+      rev = "0d66a19bc16e3d49de273c0f797d4e4781e8c0f2";
+      sha256 = "0ryp74jyihd3ckszq31bml5jr3bciimhfp7va7kw6ld92930ksv3";
+    };
+  };
+
   pycurl = super.pycurl.override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       pkgs.curl

pkgs/python-packages.nix

@@ -38,6 +38,19 b''
       license = [ pkgs.lib.licenses.mit ];
     };
   };
+  Chameleon = super.buildPythonPackage {
+    name = "Chameleon-2.24";
+    buildInputs = with self; [];
+    doCheck = false;
+    propagatedBuildInputs = with self; [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/5a/9e/637379ffa13c5172b5c0e704833ffea6bf51cec7567f93fd6e903d53ed74/Chameleon-2.24.tar.gz";
+      md5 = "1b01f1f6533a8a11d0d2f2366dec5342";
+    };
+    meta = {
+      license = [ { fullName = "BSD-like (http://repoze.org/license.html)"; } ];
+    };
+  };
   Fabric = super.buildPythonPackage {
     name = "Fabric-1.10.0";
     buildInputs = with self; [];
@@ -169,13 +182,13 b''
     };
   };
   Pygments = super.buildPythonPackage {
-    name = "Pygments-2.0.2";
+    name = "Pygments-2.1.3";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/f4/c6/bdbc5a8a112256b2b6136af304dbae93d8b1ef8738ff2d12a51018800e46/Pygments-2.0.2.tar.gz";
-      md5 = "238587a1370d62405edabd0794b3ec4a";
+      url = "https://pypi.python.org/packages/b8/67/ab177979be1c81bc99c8d0592ef22d547e70bb4c6815c383286ed5dec504/Pygments-2.1.3.tar.gz";
+      md5 = "ed3fba2467c8afcda4d317e4ef2c6150";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -467,6 +480,19 b''
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
+  channelstream = super.buildPythonPackage {
+    name = "channelstream-0.5.2";
+    buildInputs = with self; [];
+    doCheck = false;
+    propagatedBuildInputs = with self; [gevent ws4py pyramid pyramid-jinja2 itsdangerous requests six];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/2b/31/29a8e085cf5bf97fa88e7b947adabfc581a18a3463adf77fb6dada34a65f/channelstream-0.5.2.tar.gz";
+      md5 = "1c5eb2a8a405be6f1073da94da6d81d3";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
   click = super.buildPythonPackage {
     name = "click-5.1";
     buildInputs = with self; [];
@@ -558,6 +584,19 b''
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
+  deform = super.buildPythonPackage {
+    name = "deform-2.0a2";
+    buildInputs = with self; [];
+    doCheck = false;
+    propagatedBuildInputs = with self; [Chameleon colander peppercorn translationstring zope.deprecation];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/8d/b3/aab57e81da974a806dc9c5fa024a6404720f890a6dcf2e80885e3cb4609a/deform-2.0a2.tar.gz";
+      md5 = "7a90d41f7fbc18002ce74f39bd90a5e4";
+    };
+    meta = {
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
+  };
   docutils = super.buildPythonPackage {
     name = "docutils-0.12";
     buildInputs = with self; [];
@@ -572,13 +611,13 b''
     };
   };
   dogpile.cache = super.buildPythonPackage {
-    name = "dogpile.cache-0.5.7";
+    name = "dogpile.cache-0.6.1";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [dogpile.core];
+    propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/07/74/2a83bedf758156d9c95d112691bbad870d3b77ccbcfb781b4ef836ea7d96/dogpile.cache-0.5.7.tar.gz";
-      md5 = "3e58ce41af574aab41d78e9c4190f194";
+      url = "https://pypi.python.org/packages/f6/a0/6f2142c58c6588d17c734265b103ae1cd0741e1681dd9483a63f22033375/dogpile.cache-0.6.1.tar.gz";
+      md5 = "35d7fb30f22bbd0685763d894dd079a9";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -688,6 +727,19 b''
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
+  gevent = super.buildPythonPackage {
+    name = "gevent-1.1.1";
+    buildInputs = with self; [];
+    doCheck = false;
+    propagatedBuildInputs = with self; [greenlet];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/12/dc/0b2e57823225de86f6e111a65d212c9e3b64847dddaa19691a6cb94b0b2e/gevent-1.1.1.tar.gz";
+      md5 = "1532f5396ab4d07a231f1935483be7c3";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
   gnureadline = super.buildPythonPackage {
     name = "gnureadline-6.3.3";
     buildInputs = with self; [];
@@ -702,7 +754,7 b''
     };
   };
   gprof2dot = super.buildPythonPackage {
-    name = "gprof2dot-2015.12.1";
+    name = "gprof2dot-2015.12.01";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
@@ -714,6 +766,19 b''
       license = [ { fullName = "LGPL"; } ];
     };
   };
+  greenlet = super.buildPythonPackage {
+    name = "greenlet-0.4.9";
+    buildInputs = with self; [];
+    doCheck = false;
+    propagatedBuildInputs = with self; [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/4e/3d/9d421539b74e33608b245092870156b2e171fb49f2b51390aa4641eecb4a/greenlet-0.4.9.zip";
+      md5 = "c6659cdb2a5e591723e629d2eef22e82";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
   gunicorn = super.buildPythonPackage {
     name = "gunicorn-19.6.0";
     buildInputs = with self; [];
@@ -948,6 +1013,19 b''
       license = [ { fullName = "Expat license"; } pkgs.lib.licenses.mit ];
     };
   };
+  peppercorn = super.buildPythonPackage {
+    name = "peppercorn-0.5";
+    buildInputs = with self; [];
+    doCheck = false;
+    propagatedBuildInputs = with self; [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/45/ec/a62ec317d1324a01567c5221b420742f094f05ee48097e5157d32be3755c/peppercorn-0.5.tar.gz";
+      md5 = "f08efbca5790019ab45d76b7244abd40";
+    };
+    meta = {
+      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
+    };
+  };
   psutil = super.buildPythonPackage {
     name = "psutil-2.2.1";
     buildInputs = with self; [];
@@ -962,13 +1040,13 b''
     };
   };
   psycopg2 = super.buildPythonPackage {
-    name = "psycopg2-2.6";
+    name = "psycopg2-2.6.1";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/dd/c7/9016ff8ff69da269b1848276eebfb264af5badf6b38caad805426771f04d/psycopg2-2.6.tar.gz";
-      md5 = "fbbb039a8765d561a1c04969bbae7c74";
+      url = "https://pypi.python.org/packages/86/fd/cc8315be63a41fe000cce20482a917e874cdc1151e62cb0141f5e55f711e/psycopg2-2.6.1.tar.gz";
+      md5 = "842b44f8c95517ed5b792081a2370da1";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpt21 { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL with exceptions or ZPL"; } ];
@@ -1000,6 +1078,19 b''
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
+  py-gfm = super.buildPythonPackage {
+    name = "py-gfm-0.1.3";
+    buildInputs = with self; [];
+    doCheck = false;
+    propagatedBuildInputs = with self; [setuptools Markdown];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/12/e4/6b3d8678da04f97d7490d8264d8de51c2dc9fb91209ccee9c515c95e14c5/py-gfm-0.1.3.tar.gz";
+      md5 = "e588d9e69640a241b97e2c59c22527a6";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
   pycrypto = super.buildPythonPackage {
     name = "pycrypto-2.6.1";
     buildInputs = with self; [];
@@ -1339,23 +1430,23 b''
     };
   };
   rhodecode-enterprise-ce = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.2.1";
+    name = "rhodecode-enterprise-ce-4.3.0";
     buildInputs = with self; [WebTest configobj cssselect flake8 lxml mock pytest pytest-cov pytest-runner];
     doCheck = true;
-    propagatedBuildInputs = with self; [Babel Beaker FormEncode Mako Markdown MarkupSafe MySQL-python Paste PasteDeploy PasteScript Pygments Pylons Pyro4 Routes SQLAlchemy Tempita URLObject WebError WebHelpers WebHelpers2 WebOb WebTest Whoosh alembic amqplib anyjson appenlight-client authomatic backport-ipaddress celery colander decorator docutils gunicorn infrae.cache ipython iso8601 kombu msgpack-python packaging psycopg2 pycrypto pycurl pyparsing pyramid pyramid-debugtoolbar pyramid-mako pyramid-beaker pysqlite python-dateutil python-ldap python-memcached python-pam recaptcha-client repoze.lru requests simplejson waitress zope.cachedescriptors psutil py-bcrypt];
+    propagatedBuildInputs = with self; [Babel Beaker FormEncode Mako Markdown MarkupSafe MySQL-python Paste PasteDeploy PasteScript Pygments Pylons Pyro4 Routes SQLAlchemy Tempita URLObject WebError WebHelpers WebHelpers2 WebOb WebTest Whoosh alembic amqplib anyjson appenlight-client authomatic backport-ipaddress celery channelstream colander decorator deform docutils gevent gunicorn infrae.cache ipython iso8601 kombu msgpack-python packaging psycopg2 py-gfm pycrypto pycurl pyparsing pyramid pyramid-debugtoolbar pyramid-mako pyramid-beaker pysqlite python-dateutil python-ldap python-memcached python-pam recaptcha-client repoze.lru requests simplejson waitress zope.cachedescriptors dogpile.cache dogpile.core psutil py-bcrypt];
     src = ./.;
     meta = {
       license = [ { fullName = "AGPLv3, and Commercial License"; } ];
     };
   };
   rhodecode-tools = super.buildPythonPackage {
-    name = "rhodecode-tools-0.8.3";
+    name = "rhodecode-tools-0.10.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [click future six Mako MarkupSafe requests Whoosh elasticsearch elasticsearch-dsl];
     src = fetchurl {
-      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.8.3.zip";
-      md5 = "9acdfd71b8ddf4056057065f37ab9ccb";
+      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.10.0.zip";
+      md5 = "4762391473ded761bead3aa58c748044";
     };
     meta = {
       license = [ { fullName = "AGPLv3 and Proprietary"; } ];
@@ -1453,13 +1544,13 b''
     };
   };
   supervisor = super.buildPythonPackage {
-    name = "supervisor-3.1.3";
+    name = "supervisor-3.3.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [meld3];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/a6/41/65ad5bd66230b173eb4d0b8810230f3a9c59ef52ae066e540b6b99895db7/supervisor-3.1.3.tar.gz";
-      md5 = "aad263c4fbc070de63dd354864d5e552";
+      url = "https://pypi.python.org/packages/44/80/d28047d120bfcc8158b4e41127706731ee6a3419c661e0a858fb0e7c4b2d/supervisor-3.3.0.tar.gz";
+      md5 = "46bac00378d1eddb616752b990c67416";
     };
     meta = {
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
@@ -1556,6 +1647,19 b''
       license = [ pkgs.lib.licenses.zpt21 ];
     };
   };
+  ws4py = super.buildPythonPackage {
+    name = "ws4py-0.3.5";
+    buildInputs = with self; [];
+    doCheck = false;
+    propagatedBuildInputs = with self; [];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/b6/4f/34af703be86939629479e74d6e650e39f3bd73b3b09212c34e5125764cbc/ws4py-0.3.5.zip";
+      md5 = "a261b75c20b980e55ce7451a3576a867";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
   wsgiref = super.buildPythonPackage {
     name = "wsgiref-0.1.2";
     buildInputs = with self; [];

requirements.txt

@@ -11,7 +11,7 b' MySQL-python==1.2.5'
 Paste==2.0.2
 PasteDeploy==1.5.2
 PasteScript==1.7.5
-Pygments==2.0.2
+Pygments==2.1.3
 
 # TODO: This version is not available on PyPI
 # Pylons==1.0.2.dev20160108
@@ -24,10 +24,6 b' Pyro4==4.41'
 # TODO: This should probably not be in here
 # -e hg+https://[e-mail]/johbo/rhodecode-fork@3a454bd1f17c0b2b2a951cf2b111e0320d7942a9#egg=RhodeCodeEnterprise-dev
 
-# TODO: This is not really a dependency, we should add it only
-# into the development environment, since there it is useful.
-# RhodeCodeVCSServer==3.9.0
-
 Routes==1.13
 SQLAlchemy==0.9.9
 Sphinx==1.2.2
@@ -53,6 +49,7 b' backport-ipaddress==0.1'
 bottle==0.12.8
 bumpversion==0.5.3
 celery==2.2.10
+channelstream==0.5.2
 click==5.1
 colander==1.2
 configobj==5.0.6
@@ -60,15 +57,18 b' cov-core==1.15.0'
 coverage==3.7.1
 cssselect==0.9.1
 decorator==3.4.2
+deform==2.0a2
 docutils==0.12
-dogpile.cache==0.5.7
+dogpile.cache==0.6.1
 dogpile.core==0.4.1
 dulwich==0.12.0
 ecdsa==0.11
 flake8==2.4.1
 future==0.14.3
 futures==3.0.2
+gevent==1.1.1
 gprof2dot==2015.12.1
+greenlet==0.4.9
 gunicorn==19.6.0
 
 # TODO: Needs subvertpy and blows up without Subversion headers,
@@ -94,9 +94,10 b' packaging==15.2'
 paramiko==1.15.1
 pep8==1.5.7
 psutil==2.2.1
-psycopg2==2.6
+psycopg2==2.6.1
 py==1.4.29
 py-bcrypt==0.4
+py-gfm==0.1.3
 pycrypto==2.6.1
 pycurl==7.19.5
 pyflakes==0.8.1
@@ -123,7 +124,7 b' pyzmq==14.6.0'
 # TODO: This is not available in public
 # rc-testdata==0.2.0
 
-https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.8.3.zip#md5=9acdfd71b8ddf4056057065f37ab9ccb
+https://code.rhodecode.com/rhodecode-tools-ce/archive/v0.10.0.zip#md5=4762391473ded761bead3aa58c748044
 
 
 recaptcha-client==1.0.6
@@ -136,7 +137,7 b' setuptools-scm==1.11.0'
 simplejson==3.7.2
 six==1.9.0
 subprocess32==3.2.6
-supervisor==3.1.3
+supervisor==3.3.0
 transifex-client==0.10
 translationstring==1.3
 trollius==1.0.4

rhodecode/VERSION

@@ -1,1 +1,1 b''
-4.2.1
  No newline at end of file
+4.3.0
  No newline at end of file

rhodecode/__init__.py

@@ -43,11 +43,15 b' CELERY_EAGER = False'
 # link to config for pylons
 CONFIG = {}
 
+# Populated with the settings dictionary from application init in
+# rhodecode.conf.environment.load_pyramid_environment
+PYRAMID_SETTINGS = {}
+
 # Linked module for extensions
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 54  # defines current db version for migrations
+__dbversion__ = 55  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'

rhodecode/admin/navigation.py

@@ -80,6 +80,8 b' class NavigationRegistry(object):'
         NavEntry('email', _('Email'), 'admin_settings_email'),
         NavEntry('hooks', _('Hooks'), 'admin_settings_hooks'),
         NavEntry('search', _('Full Text Search'), 'admin_settings_search'),
+        NavEntry('integrations', _('Integrations'),
+                 'global_integrations_home', pyramid=True),
         NavEntry('system', _('System Info'), 'admin_settings_system'),
         NavEntry('open_source', _('Open Source Licenses'),
                  'admin_settings_open_source', pyramid=True),

rhodecode/api/__init__.py

@@ -25,12 +25,15 b' import types'
 
 import decorator
 import venusian
+from collections import OrderedDict
+
 from pyramid.exceptions import ConfigurationError
 from pyramid.renderers import render
 from pyramid.response import Response
 from pyramid.httpexceptions import HTTPNotFound
 
-from rhodecode.api.exc import JSONRPCBaseError, JSONRPCError, JSONRPCForbidden
+from rhodecode.api.exc import (
+    JSONRPCBaseError, JSONRPCError, JSONRPCForbidden, JSONRPCValidationError)
 from rhodecode.lib.auth import AuthUser
 from rhodecode.lib.base import get_ip_addr
 from rhodecode.lib.ext_json import json
@@ -127,6 +130,11 b' def exception_view(exc, request):'
     if isinstance(exc, JSONRPCError):
         fault_message = exc.message
         log.debug('json-rpc error rpc_id:%s "%s"', rpc_id, fault_message)
+    elif isinstance(exc, JSONRPCValidationError):
+        colander_exc = exc.colander_exception
+        #TODO: think maybe of nicer way to serialize errors ?
+        fault_message = colander_exc.asdict()
+        log.debug('json-rpc error rpc_id:%s "%s"', rpc_id, fault_message)
     elif isinstance(exc, JSONRPCForbidden):
         fault_message = 'Access was denied to this resource.'
         log.warning('json-rpc forbidden call rpc_id:%s "%s"', rpc_id, fault_message)
@@ -474,7 +482,7 b' def includeme(config):'
         plugin_module, config.registry.settings)
 
     if not hasattr(config.registry, 'jsonrpc_methods'):
-        config.registry.jsonrpc_methods = {}
+        config.registry.jsonrpc_methods = OrderedDict()
 
     # match filter by given method only
     config.add_view_predicate(

rhodecode/api/exc.py

@@ -27,5 +27,13 b' class JSONRPCError(JSONRPCBaseError):'
     pass
 
 
+class JSONRPCValidationError(JSONRPCBaseError):
+
+    def __init__(self, *args, **kwargs):
+        self.colander_exception = kwargs.pop('colander_exc')
+        super(JSONRPCValidationError, self).__init__(*args, **kwargs)
+
+
 class JSONRPCForbidden(JSONRPCBaseError):
     pass
+

rhodecode/api/tests/test_create_gist.py

@@ -43,7 +43,7 b' class TestApiCreateGist(object):'
             description='foobar-gist',
             gist_type=gist_type,
             acl_level=gist_acl_level,
-            files={'foobar': {'content': 'foo'}})
+            files={'foobar_ąć': {'content': 'foo'}})
         response = api_call(self.app, params)
         response_json = response.json
         gist = response_json['result']['gist']
@@ -68,6 +68,32 b' class TestApiCreateGist(object):'
         finally:
             Fixture().destroy_gists()
 
+    @pytest.mark.parametrize("expected, lifetime, gist_type, gist_acl_level, files", [
+        ({'gist_type': '"ups" is not one of private, public'},
+         10, 'ups', Gist.ACL_LEVEL_PUBLIC, {'f': {'content': 'f'}}),
+
+        ({'lifetime': '-120 is less than minimum value -1'},
+         -120, Gist.GIST_PUBLIC, Gist.ACL_LEVEL_PUBLIC, {'f': {'content': 'f'}}),
+
+        ({'0.content': 'Required'},
+         10, Gist.GIST_PUBLIC, Gist.ACL_LEVEL_PUBLIC, {'f': {'x': 'f'}}),
+    ])
+    def test_api_try_create_gist(
+            self, expected, lifetime, gist_type, gist_acl_level, files):
+        id_, params = build_data(
+            self.apikey_regular, 'create_gist',
+            lifetime=lifetime,
+            description='foobar-gist',
+            gist_type=gist_type,
+            acl_level=gist_acl_level,
+            files=files)
+        response = api_call(self.app, params)
+
+        try:
+            assert_error(id_, expected, given=response.body)
+        finally:
+            Fixture().destroy_gists()
+
     @mock.patch.object(GistModel, 'create', crash)
     def test_api_create_gist_exception_occurred(self):
         id_, params = build_data(self.apikey_regular, 'create_gist', files={})

rhodecode/api/tests/test_deprecated_api.py

@@ -21,7 +21,7 b''
 
 import pytest
 
-from rhodecode.api.views import depracated_api
+from rhodecode.api.views import deprecated_api
 from rhodecode.lib.ext_json import json
 from rhodecode.api.tests.utils import (
     build_data, api_call)
@@ -30,7 +30,7 b' from rhodecode.api.tests.utils import ('
 @pytest.mark.usefixtures("testuser_api", "app")
 class TestCommitComment(object):
     def test_deprecated_message_in_docstring(self):
-        docstring = depracated_api.changeset_comment.__doc__
+        docstring = deprecated_api.changeset_comment.__doc__
         assert '.. deprecated:: 3.4.0' in docstring
         assert 'Please use method `comment_commit` instead.' in docstring
 

rhodecode/api/tests/test_get_repo_nodes.py

@@ -73,6 +73,29 b' class TestGetRepoNodes(object):'
         expected = 'failed to get repo: `%s` nodes' % (backend.repo_name,)
         assert_error(id_, expected, given=response.body)
 
+    def test_api_get_repo_nodes_max_file_bytes(self, backend):
+        commit_id = 'tip'
+        path = '/'
+        max_file_bytes = 500
+
+        id_, params = build_data(
+            self.apikey, 'get_repo_nodes',
+            repoid=backend.repo_name, revision=commit_id, details='full',
+            root_path=path)
+        response = api_call(self.app, params)
+        assert any(file['content'] and len(file['content']) > max_file_bytes
+                   for file in response.json['result'])
+
+        id_, params = build_data(
+            self.apikey, 'get_repo_nodes',
+            repoid=backend.repo_name, revision=commit_id,
+            root_path=path, details='full',
+            max_file_bytes=max_file_bytes)
+        response = api_call(self.app, params)
+        assert all(
+            file['content'] is None if file['size'] > max_file_bytes else True
+            for file in response.json['result'])
+
     def test_api_get_repo_nodes_bad_ret_type(self, backend):
         commit_id = 'tip'
         path = '/'

rhodecode/api/tests/test_update_repo.py

@@ -47,9 +47,14 b' class TestApiUpdateRepo(object):'
         ({'enable_statistics': True}, SAME_AS_UPDATES),
         ({'enable_locking': True}, SAME_AS_UPDATES),
         ({'enable_downloads': True}, SAME_AS_UPDATES),
-        ({'name': 'new_repo_name'}, {'repo_name': 'new_repo_name'}),
-        ({'group': 'test_group_for_update'},
-            {'repo_name': 'test_group_for_update/%s' % UPDATE_REPO_NAME}),
+        ({'name': 'new_repo_name'}, {
+            'repo_name': 'new_repo_name',
+            'url': 'http://test.example.com:80/new_repo_name',
+        }),
+        ({'group': 'test_group_for_update'}, {
+            'repo_name': 'test_group_for_update/%s' % UPDATE_REPO_NAME,
+            'url': 'http://test.example.com:80/test_group_for_update/%s' % UPDATE_REPO_NAME
+        }),
     ])
     def test_api_update_repo(self, updates, expected, backend):
         repo_name = UPDATE_REPO_NAME

rhodecode/api/utils.py

@@ -34,8 +34,6 b' from rhodecode.lib.vcs.exceptions import'
 log = logging.getLogger(__name__)
 
 
-
-
 class OAttr(object):
     """
     Special Option that defines other attribute, and can default to them

rhodecode/api/views/gist_api.py

@@ -23,6 +23,7 b' import logging'
 import time
 
 from rhodecode.api import jsonrpc_method, JSONRPCError
+from rhodecode.api.exc import JSONRPCValidationError
 from rhodecode.api.utils import (
     Optional, OAttr, get_gist_or_error, get_user_or_error,
     has_superadmin_permission)
@@ -96,7 +97,8 b' def get_gists(request, apiuser, userid=O'
 
 @jsonrpc_method()
 def create_gist(
-        request, apiuser, files, owner=Optional(OAttr('apiuser')),
+        request, apiuser, files, gistid=Optional(None),
+        owner=Optional(OAttr('apiuser')),
         gist_type=Optional(Gist.GIST_PUBLIC), lifetime=Optional(-1),
         acl_level=Optional(Gist.ACL_LEVEL_PUBLIC),
         description=Optional('')):
@@ -108,10 +110,11 b' def create_gist('
     :param files: files to be added to the gist. The data structure has
         to match the following example::
 
-          {'filename': {'content':'...', 'lexer': null},
-           'filename2': {'content':'...', 'lexer': null}}
+          {'filename1': {'content':'...'}, 'filename2': {'content':'...'}}
 
     :type files: dict
+    :param gistid: Set a custom id for the gist
+    :type gistid: Optional(str)
     :param owner: Set the gist owner, defaults to api method caller
     :type owner: Optional(str or int)
     :param gist_type: type of gist ``public`` or ``private``
@@ -148,23 +151,49 b' def create_gist('
       }
 
     """
+    from rhodecode.model import validation_schema
+    from rhodecode.model.validation_schema.schemas import gist_schema
+
+    if isinstance(owner, Optional):
+        owner = apiuser.user_id
+
+    owner = get_user_or_error(owner)
+
+    lifetime = Optional.extract(lifetime)
+    schema = gist_schema.GistSchema().bind(
+        # bind the given values if it's allowed, however the deferred
+        # validator will still validate it according to other rules
+        lifetime_options=[lifetime])
 
     try:
-        if isinstance(owner, Optional):
-            owner = apiuser.user_id
+        nodes = gist_schema.nodes_to_sequence(
+            files, colander_node=schema.get('nodes'))
+
+        schema_data = schema.deserialize(dict(
+            gistid=Optional.extract(gistid),
+            description=Optional.extract(description),
+            gist_type=Optional.extract(gist_type),
+            lifetime=lifetime,
+            gist_acl_level=Optional.extract(acl_level),
+            nodes=nodes
+        ))
 
-        owner = get_user_or_error(owner)
-        description = Optional.extract(description)
-        gist_type = Optional.extract(gist_type)
-        lifetime = Optional.extract(lifetime)
-        acl_level = Optional.extract(acl_level)
+        # convert to safer format with just KEYs so we sure no duplicates
+        schema_data['nodes'] = gist_schema.sequence_to_nodes(
+            schema_data['nodes'], colander_node=schema.get('nodes'))
+
+    except validation_schema.Invalid as err:
+        raise JSONRPCValidationError(colander_exc=err)
 
-        gist = GistModel().create(description=description,
-                                  owner=owner,
-                                  gist_mapping=files,
-                                  gist_type=gist_type,
-                                  lifetime=lifetime,
-                                  gist_acl_level=acl_level)
+    try:
+        gist = GistModel().create(
+            owner=owner,
+            gist_id=schema_data['gistid'],
+            description=schema_data['description'],
+            gist_mapping=schema_data['nodes'],
+            gist_type=schema_data['gist_type'],
+            lifetime=schema_data['lifetime'],
+            gist_acl_level=schema_data['gist_acl_level'])
         Session().commit()
         return {
             'msg': 'created new gist',

rhodecode/api/views/pull_request_api.py

@@ -265,7 +265,7 b' def merge_pull_request(request, apiuser,'
         PullRequestModel().close_pull_request(
             pull_request.pull_request_id, apiuser)
 
-        Session.commit()
+        Session().commit()
     return data
 
 
@@ -319,7 +319,7 b' def close_pull_request(request, apiuser,'
 
     PullRequestModel().close_pull_request(
         pull_request.pull_request_id, apiuser)
-    Session.commit()
+    Session().commit()
     data = {
         'pull_request_id': pull_request.pull_request_id,
         'closed': True,
@@ -408,6 +408,8 b' def comment_pull_request(request, apiuse'
         line_no=None,
         status_change=(ChangesetStatus.get_status_lbl(status)
                        if status and allowed_to_change_status else None),
+        status_change_type=(status
+                            if status and allowed_to_change_status else None),
         closing_pr=False,
         renderer=renderer
     )

rhodecode/api/views/repo_api.py

@@ -43,8 +43,8 b' from rhodecode.model.db import ('
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.scm import ScmModel, RepoList
-from rhodecode.model.settings import SettingsModel
-from rhodecode.model.validation_schema import RepoSchema
+from rhodecode.model.settings import SettingsModel, VcsSettingsModel
+from rhodecode.model.validation_schema.schemas import repo_schema
 
 log = logging.getLogger(__name__)
 
@@ -400,7 +400,8 b' def get_repo_changesets(request, apiuser'
 
 @jsonrpc_method()
 def get_repo_nodes(request, apiuser, repoid, revision, root_path,
-                   ret_type=Optional('all'), details=Optional('basic')):
+                   ret_type=Optional('all'), details=Optional('basic'),
+                   max_file_bytes=Optional(None)):
     """
     Returns a list of nodes and children in a flat list for a given
     path at given revision.
@@ -425,6 +426,8 b' def get_repo_nodes(request, apiuser, rep'
         md5, binary, and or content.  The valid options are ``basic`` and
         ``full``.
     :type details: Optional(str)
+    :param max_file_bytes: Only return file content under this file size bytes
+    :type details: Optional(int)
 
     Example output:
 
@@ -472,7 +475,8 b' def get_repo_nodes(request, apiuser, rep'
 
         _d, _f = ScmModel().get_nodes(
             repo, revision, root_path, flat=False,
-            extended_info=extended_info, content=content)
+            extended_info=extended_info, content=content,
+            max_file_bytes=max_file_bytes)
         _map = {
             'all': _d + _f,
             'files': _f,
@@ -606,7 +610,7 b' def create_repo(request, apiuser, repo_n'
       }
 
     """
-    schema = RepoSchema()
+    schema = repo_schema.RepoSchema()
     try:
         data = schema.deserialize({
             'repo_name': repo_name
@@ -1310,8 +1314,6 b' def comment_commit('
         userid=Optional(OAttr('apiuser')), status=Optional(None)):
     """
     Set a commit comment, and optionally change the status of the commit.
-    This command can be executed only using api_key belonging to user
-    with admin rights, or repository administrator.
 
     :param apiuser: This is filled automatically from the |authtoken|.
     :type apiuser: AuthUser
@@ -1344,7 +1346,7 b' def comment_commit('
     """
     repo = get_repo_or_error(repoid)
     if not has_superadmin_permission(apiuser):
-        _perms = ('repository.admin',)
+        _perms = ('repository.read', 'repository.write', 'repository.admin')
         has_repo_permissions(apiuser, repoid, repo, _perms)
 
     if isinstance(userid, Optional):
@@ -1361,9 +1363,11 b' def comment_commit('
     try:
         rc_config = SettingsModel().get_all_settings()
         renderer = rc_config.get('rhodecode_markup_renderer', 'rst')
-
+        status_change_label = ChangesetStatus.get_status_lbl(status)
         comm = ChangesetCommentsModel().create(
-            message, repo, user, revision=commit_id, status_change=status,
+            message, repo, user, revision=commit_id,
+            status_change=status_change_label,
+            status_change_type=status,
             renderer=renderer)
         if status:
             # also do a status change
@@ -1775,3 +1779,110 b' def strip(request, apiuser, repoid, revi'
             'Unable to strip commit %s from repo `%s`' % (
                 revision, repo.repo_name)
         )
+
+
+@jsonrpc_method()
+def get_repo_settings(request, apiuser, repoid, key=Optional(None)):
+    """
+    Returns all settings for a repository. If key is given it only returns the
+    setting identified by the key or null.
+
+    :param apiuser: This is filled automatically from the |authtoken|.
+    :type apiuser: AuthUser
+    :param repoid: The repository name or repository id.
+    :type repoid: str or int
+    :param key: Key of the setting to return.
+    :type: key: Optional(str)
+
+    Example output:
+
+    .. code-block:: bash
+
+        {
+            "error": null,
+            "id": 237,
+            "result": {
+                "extensions_largefiles": true,
+                "hooks_changegroup_push_logger": true,
+                "hooks_changegroup_repo_size": false,
+                "hooks_outgoing_pull_logger": true,
+                "phases_publish": "True",
+                "rhodecode_hg_use_rebase_for_merging": true,
+                "rhodecode_pr_merge_enabled": true,
+                "rhodecode_use_outdated_comments": true
+            }
+        }
+    """
+
+    # Restrict access to this api method to admins only.
+    if not has_superadmin_permission(apiuser):
+        raise JSONRPCForbidden()
+
+    try:
+        repo = get_repo_or_error(repoid)
+        settings_model = VcsSettingsModel(repo=repo)
+        settings = settings_model.get_global_settings()
+        settings.update(settings_model.get_repo_settings())
+
+        # If only a single setting is requested fetch it from all settings.
+        key = Optional.extract(key)
+        if key is not None:
+            settings = settings.get(key, None)
+    except Exception:
+        msg = 'Failed to fetch settings for repository `{}`'.format(repoid)
+        log.exception(msg)
+        raise JSONRPCError(msg)
+
+    return settings
+
+
+@jsonrpc_method()
+def set_repo_settings(request, apiuser, repoid, settings):
+    """
+    Update repository settings. Returns true on success.
+
+    :param apiuser: This is filled automatically from the |authtoken|.
+    :type apiuser: AuthUser
+    :param repoid: The repository name or repository id.
+    :type repoid: str or int
+    :param settings: The new settings for the repository.
+    :type: settings: dict
+
+    Example output:
+
+    .. code-block:: bash
+
+        {
+            "error": null,
+            "id": 237,
+            "result": true
+        }
+    """
+    # Restrict access to this api method to admins only.
+    if not has_superadmin_permission(apiuser):
+        raise JSONRPCForbidden()
+
+    if type(settings) is not dict:
+        raise JSONRPCError('Settings have to be a JSON Object.')
+
+    try:
+        settings_model = VcsSettingsModel(repo=repoid)
+
+        # Merge global, repo and incoming settings.
+        new_settings = settings_model.get_global_settings()
+        new_settings.update(settings_model.get_repo_settings())
+        new_settings.update(settings)
+
+        # Update the settings.
+        inherit_global_settings = new_settings.get(
+            'inherit_global_settings', False)
+        settings_model.create_or_update_repo_settings(
+            new_settings, inherit_global_settings=inherit_global_settings)
+        Session().commit()
+    except Exception:
+        msg = 'Failed to update settings for repository `{}`'.format(repoid)
+        log.exception(msg)
+        raise JSONRPCError(msg)
+
+    # Indicate success.
+    return True

rhodecode/api/views/repo_group_api.py

@@ -34,7 +34,7 b' from rhodecode.lib.auth import ('
 from rhodecode.model.db import Session, RepoGroup
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.scm import RepoGroupList
-from rhodecode.model.validation_schema import RepoGroupSchema
+from rhodecode.model.validation_schema.schemas import repo_group_schema
 
 
 log = logging.getLogger(__name__)
@@ -193,7 +193,7 b' def create_repo_group(request, apiuser, '
 
     """
 
-    schema = RepoGroupSchema()
+    schema = repo_group_schema.RepoGroupSchema()
     try:
         data = schema.deserialize({
             'group_name': group_name

rhodecode/authentication/base.py

@@ -490,20 +490,26 b' def loadplugin(plugin_id):'
     or None on failure.
     """
     # TODO: Disusing pyramids thread locals to retrieve the registry.
-    authn_registry = get_current_registry().getUtility(IAuthnPluginRegistry)
+    authn_registry = get_authn_registry()
     plugin = authn_registry.get_plugin(plugin_id)
     if plugin is None:
         log.error('Authentication plugin not found: "%s"', plugin_id)
     return plugin
 
 
+def get_authn_registry(registry=None):
+    registry = registry or get_current_registry()
+    authn_registry = registry.getUtility(IAuthnPluginRegistry)
+    return authn_registry
+
+
 def get_auth_cache_manager(custom_ttl=None):
     return caches.get_cache_manager(
         'auth_plugins', 'rhodecode.authentication', custom_ttl)
 
 
 def authenticate(username, password, environ=None, auth_type=None,
-                 skip_missing=False):
+                 skip_missing=False, registry=None):
     """
     Authentication function used for access control,
     It tries to authenticate based on enabled authentication modules.
@@ -520,7 +526,7 b' def authenticate(username, password, env'
                          % auth_type)
     headers_only = environ and not (username and password)
 
-    authn_registry = get_current_registry().getUtility(IAuthnPluginRegistry)
+    authn_registry = get_authn_registry(registry)
     for plugin in authn_registry.get_plugins_for_authentication():
         plugin.set_auth_type(auth_type)
         user = plugin.get_user(username)
@@ -559,16 +565,16 b' def authenticate(username, password, env'
         if isinstance(plugin.AUTH_CACHE_TTL, (int, long)):
             # plugin cache set inside is more important than the settings value
             _cache_ttl = plugin.AUTH_CACHE_TTL
-        elif plugin_settings.get('auth_cache_ttl'):
-            _cache_ttl = safe_int(plugin_settings.get('auth_cache_ttl'), 0)
+        elif plugin_settings.get('cache_ttl'):
+            _cache_ttl = safe_int(plugin_settings.get('cache_ttl'), 0)
 
         plugin_cache_active = bool(_cache_ttl and _cache_ttl > 0)
 
         # get instance of cache manager configured for a namespace
         cache_manager = get_auth_cache_manager(custom_ttl=_cache_ttl)
 
-        log.debug('Cache for plugin `%s` active: %s', plugin.get_id(),
-                  plugin_cache_active)
+        log.debug('AUTH_CACHE_TTL for plugin `%s` active: %s (TTL: %s)',
+                  plugin.get_id(), plugin_cache_active, _cache_ttl)
 
         # for environ based password can be empty, but then the validation is
         # on the server that fills in the env data needed for authentication
@@ -581,8 +587,7 b' def authenticate(username, password, env'
         # to RhodeCode database. If this function returns data
         # then auth is correct.
         start = time.time()
-        log.debug('Running plugin `%s` _authenticate method',
-                  plugin.get_id())
+        log.debug('Running plugin `%s` _authenticate method', plugin.get_id())
 
         def auth_func():
             """

rhodecode/authentication/plugins/auth_ldap.py

@@ -141,9 +141,9 b' class LdapSettingsSchema(AuthnPluginSett'
         colander.String(),
         default='',
         description=_('LDAP Attribute to map to user name'),
-        missing_msg=_('The LDAP Login attribute of the CN must be specified'),
         preparer=strip_whitespace,
         title=_('Login Attribute'),
+        missing_msg=_('The LDAP Login attribute of the CN must be specified'),
         widget='string')
     attr_firstname = colander.SchemaNode(
         colander.String(),
@@ -186,6 +186,7 b' class AuthLdap(object):'
         if ldap == Missing:
             raise LdapImportError("Missing or incompatible ldap library")
 
+        self.debug = False
         self.ldap_version = ldap_version
         self.ldap_server_type = 'ldap'
 
@@ -213,6 +214,8 b' class AuthLdap(object):'
         self.LDAP_FILTER = safe_str(ldap_filter)
 
     def _get_ldap_server(self):
+        if self.debug:
+            ldap.set_option(ldap.OPT_DEBUG_LEVEL, 255)
         if hasattr(ldap, 'OPT_X_TLS_CACERTDIR'):
             ldap.set_option(ldap.OPT_X_TLS_CACERTDIR,
                             '/etc/openldap/cacerts')

rhodecode/authentication/plugins/auth_rhodecode.py

@@ -137,5 +137,7 b' class RhodeCodeAuthPlugin(RhodeCodeAuthP'
                      "authenticating on this plugin", userobj)
             return None
         else:
-            log.warning('user %s tried auth but is disabled', userobj)
+            log.warning(
+                'user `%s` failed to authenticate via %s, reason: account not '
+                'active.', username, self.name)
             return None

rhodecode/authentication/plugins/auth_token.py

@@ -83,13 +83,17 b' class RhodeCodeAuthPlugin(RhodeCodeAuthP'
             allowed_auth_plugins=None, allowed_auth_sources=None):
         """
         Custom method for this auth that doesn't accept empty users. And also
-        allows rhodecode and authtoken extern_type to auth with this. But only
-        via vcs mode
+        allows users from all other active plugins to use it and also
+        authenticate against it. But only via vcs mode
         """
-        # only this and rhodecode plugins can use this type
-        from rhodecode.authentication.plugins import auth_rhodecode
-        allowed_auth_plugins = [
-            self.name, auth_rhodecode.RhodeCodeAuthPlugin.name]
+        from rhodecode.authentication.base import get_authn_registry
+        authn_registry = get_authn_registry()
+
+        active_plugins = set(
+            [x.name for x in authn_registry.get_plugins_for_authentication()])
+        active_plugins.discard(self.name)
+
+        allowed_auth_plugins = [self.name] + list(active_plugins)
         # only for vcs operations
         allowed_auth_sources = [VCS_TYPE]
 

rhodecode/authentication/views.py

@@ -26,8 +26,8 b' from pyramid.httpexceptions import HTTPF'
 from pyramid.renderers import render
 from pyramid.response import Response
 
-from rhodecode.authentication.base import get_auth_cache_manager
-from rhodecode.authentication.interface import IAuthnPluginRegistry
+from rhodecode.authentication.base import (
+    get_auth_cache_manager, get_authn_registry)
 from rhodecode.lib import auth
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.model.forms import AuthSettingsForm
@@ -96,7 +96,7 b' class AuthnPluginViewBase(object):'
         # Store validated data.
         for name, value in valid_data.items():
             self.plugin.create_or_update_setting(name, value)
-        Session.commit()
+        Session().commit()
 
         # Display success message and redirect.
         self.request.session.flash(
@@ -125,7 +125,7 b' class AuthSettingsView(object):'
     @HasPermissionAllDecorator('hg.admin')
     def index(self, defaults=None, errors=None, prefix_error=False):
         defaults = defaults or {}
-        authn_registry = self.request.registry.getUtility(IAuthnPluginRegistry)
+        authn_registry = get_authn_registry(self.request.registry)
         enabled_plugins = SettingsModel().get_auth_plugins()
 
         # Create template context and render it.

rhodecode/config/conf.py

@@ -30,36 +30,6 b' from rhodecode.lib.utils2 import __get_l'
 # extensions will index it's content
 LANGUAGES_EXTENSIONS_MAP = __get_lem()
 
-# list of readme files to search in file tree and display in summary
-# attached weights defines the search  order lower is first
-ALL_READMES = [
-    ('readme', 0), ('README', 0), ('Readme', 0),
-    ('doc/readme', 1), ('doc/README', 1), ('doc/Readme', 1),
-    ('Docs/readme', 2), ('Docs/README', 2), ('Docs/Readme', 2),
-    ('DOCS/readme', 2), ('DOCS/README', 2), ('DOCS/Readme', 2),
-    ('docs/readme', 2), ('docs/README', 2), ('docs/Readme', 2),
-]
-
-# extension together with weights to search lower is first
-RST_EXTS = [
-    ('', 0), ('.rst', 1), ('.rest', 1),
-    ('.RST', 2), ('.REST', 2)
-]
-
-MARKDOWN_EXTS = [
-    ('.md', 1), ('.MD', 1),
-    ('.mkdn', 2), ('.MKDN', 2),
-    ('.mdown', 3), ('.MDOWN', 3),
-    ('.markdown', 4), ('.MARKDOWN', 4)
-]
-
-PLAIN_EXTS = [
-    ('.text', 2), ('.TEXT', 2),
-    ('.txt', 3), ('.TXT', 3)
-]
-
-ALL_EXTS = MARKDOWN_EXTS + RST_EXTS + PLAIN_EXTS
-
 DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
 
 DATE_FORMAT = "%Y-%m-%d"

rhodecode/config/environment.py

@@ -34,11 +34,16 b' from pylons.configuration import PylonsC'
 from pylons.error import handle_mako_error
 from pyramid.settings import asbool
 
-# don't remove this import it does magic for celery
-from rhodecode.lib import celerypylons  # noqa
+# ------------------------------------------------------------------------------
+# CELERY magic until refactor - issue #4163 - import order matters here:
+from rhodecode.lib import celerypylons  # this must be first, celerypylons
+                                        # sets config settings upon import
 
-import rhodecode.lib.app_globals as app_globals
+import rhodecode.integrations           # any modules using celery task
+                                        # decorators should be added afterwards:
+# ------------------------------------------------------------------------------
 
+from rhodecode.lib import app_globals
 from rhodecode.config import utils
 from rhodecode.config.routing import make_map
 from rhodecode.config.jsroutes import generate_jsroutes_content
@@ -112,25 +117,12 b' def load_environment(global_conf, app_co'
     # sets the c attribute access when don't existing attribute are accessed
     config['pylons.strict_tmpl_context'] = True
 
-    # Limit backends to "vcs.backends" from configuration
-    backends = config['vcs.backends'] = aslist(
-        config.get('vcs.backends', 'hg,git'), sep=',')
-    for alias in rhodecode.BACKENDS.keys():
-        if alias not in backends:
-            del rhodecode.BACKENDS[alias]
-    log.info("Enabled backends: %s", backends)
-
-    # initialize vcs client and optionally run the server if enabled
-    vcs_server_uri = config.get('vcs.server', '')
-    vcs_server_enabled = str2bool(config.get('vcs.server.enable', 'true'))
-    start_server = (
-        str2bool(config.get('vcs.start_server', 'false')) and
-        not int(os.environ.get('RC_VCSSERVER_TEST_DISABLE', '0')))
-    if vcs_server_enabled and start_server:
-        log.info("Starting vcsserver")
-        start_vcs_server(server_and_port=vcs_server_uri,
-                         protocol=utils.get_vcs_server_protocol(config),
-                         log_level=config['vcs.server.log_level'])
+    # configure channelstream
+    config['channelstream_config'] = {
+        'enabled': asbool(config.get('channelstream.enabled', False)),
+        'server': config.get('channelstream.server'),
+        'secret': config.get('channelstream.secret')
+    }
 
     set_available_permissions(config)
     db_cfg = make_db_config(clear_session=True)
@@ -138,9 +130,6 b' def load_environment(global_conf, app_co'
     repos_path = list(db_cfg.items('paths'))[0][1]
     config['base_path'] = repos_path
 
-    config['vcs.hooks.direct_calls'] = _use_direct_hook_calls(config)
-    config['vcs.hooks.protocol'] = _get_vcs_hooks_protocol(config)
-
     # store db config also in main global CONFIG
     set_rhodecode_config(config)
 
@@ -153,34 +142,17 b' def load_environment(global_conf, app_co'
     # store config reference into our module to skip import magic of pylons
     rhodecode.CONFIG.update(config)
 
-    utils.configure_pyro4(config)
-    utils.configure_vcs(config)
-    if vcs_server_enabled:
-        connect_vcs(vcs_server_uri, utils.get_vcs_server_protocol(config))
-
-    import_on_startup = str2bool(config.get('startup.import_repos', False))
-    if vcs_server_enabled and import_on_startup:
-        repo2db_mapper(ScmModel().repo_scan(repos_path), remove_obsolete=False)
     return config
 
 
-def _use_direct_hook_calls(config):
-    default_direct_hook_calls = 'false'
-    direct_hook_calls = str2bool(
-        config.get('vcs.hooks.direct_calls', default_direct_hook_calls))
-    return direct_hook_calls
-
-
-def _get_vcs_hooks_protocol(config):
-    protocol = config.get('vcs.hooks.protocol', 'pyro4').lower()
-    return protocol
-
-
 def load_pyramid_environment(global_config, settings):
     # Some parts of the code expect a merge of global and app settings.
     settings_merged = global_config.copy()
     settings_merged.update(settings)
 
+    # Store the settings to make them available to other modules.
+    rhodecode.PYRAMID_SETTINGS = settings_merged
+
     # If this is a test run we prepare the test environment like
     # creating a test database, test search index and test repositories.
     # This has to be done before the database connection is initialized.
@@ -190,3 +162,27 b' def load_pyramid_environment(global_conf'
 
     # Initialize the database connection.
     utils.initialize_database(settings_merged)
+
+    # Limit backends to `vcs.backends` from configuration
+    for alias in rhodecode.BACKENDS.keys():
+        if alias not in settings['vcs.backends']:
+            del rhodecode.BACKENDS[alias]
+    log.info('Enabled VCS backends: %s', rhodecode.BACKENDS.keys())
+
+    # initialize vcs client and optionally run the server if enabled
+    vcs_server_uri = settings['vcs.server']
+    vcs_server_enabled = settings['vcs.server.enable']
+    start_server = (
+        settings['vcs.start_server'] and
+        not int(os.environ.get('RC_VCSSERVER_TEST_DISABLE', '0')))
+
+    if vcs_server_enabled and start_server:
+        log.info("Starting vcsserver")
+        start_vcs_server(server_and_port=vcs_server_uri,
+                         protocol=utils.get_vcs_server_protocol(settings),
+                         log_level=settings['vcs.server.log_level'])
+
+    utils.configure_pyro4(settings)
+    utils.configure_vcs(settings)
+    if vcs_server_enabled:
+        connect_vcs(vcs_server_uri, utils.get_vcs_server_protocol(settings))

rhodecode/config/middleware.py

@@ -22,23 +22,25 b''
 Pylons middleware initialization
 """
 import logging
+from collections import OrderedDict
 
 from paste.registry import RegistryManager
 from paste.gzipper import make_gzip_middleware
 from pylons.wsgiapp import PylonsApp
 from pyramid.authorization import ACLAuthorizationPolicy
 from pyramid.config import Configurator
-from pyramid.static import static_view
 from pyramid.settings import asbool, aslist
 from pyramid.wsgi import wsgiapp
-from pyramid.httpexceptions import HTTPError, HTTPInternalServerError
+from pyramid.httpexceptions import HTTPError, HTTPInternalServerError, HTTPFound
+from pyramid.events import ApplicationCreated
 import pyramid.httpexceptions as httpexceptions
-from pyramid.renderers import render_to_response, render
+from pyramid.renderers import render_to_response
 from routes.middleware import RoutesMiddleware
 import routes.util
 
 import rhodecode
 from rhodecode.config import patches
+from rhodecode.config.routing import STATIC_FILE_PREFIX
 from rhodecode.config.environment import (
     load_environment, load_pyramid_environment)
 from rhodecode.lib.middleware import csrf
@@ -47,24 +49,45 b' from rhodecode.lib.middleware.disable_vc'
 from rhodecode.lib.middleware.https_fixup import HttpsFixup
 from rhodecode.lib.middleware.vcs import VCSMiddleware
 from rhodecode.lib.plugins.utils import register_rhodecode_plugin
+from rhodecode.lib.utils2 import aslist as rhodecode_aslist
+from rhodecode.subscribers import scan_repositories_if_enabled
 
 
 log = logging.getLogger(__name__)
 
 
-def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
+# this is used to avoid avoid the route lookup overhead in routesmiddleware
+# for certain routes which won't go to pylons to - eg. static files, debugger
+# it is only needed for the pylons migration and can be removed once complete
+class SkippableRoutesMiddleware(RoutesMiddleware):
+    """ Routes middleware that allows you to skip prefixes """
+
+    def __init__(self, *args, **kw):
+        self.skip_prefixes = kw.pop('skip_prefixes', [])
+        super(SkippableRoutesMiddleware, self).__init__(*args, **kw)
+
+    def __call__(self, environ, start_response):
+        for prefix in self.skip_prefixes:
+            if environ['PATH_INFO'].startswith(prefix):
+                # added to avoid the case when a missing /_static route falls
+                # through to pylons and causes an exception as pylons is
+                # expecting wsgiorg.routingargs to be set in the environ
+                # by RoutesMiddleware.
+                if 'wsgiorg.routing_args' not in environ:
+                    environ['wsgiorg.routing_args'] = (None, {})
+                return self.app(environ, start_response)
+
+        return super(SkippableRoutesMiddleware, self).__call__(
+            environ, start_response)
+
+
+def make_app(global_conf, static_files=True, **app_conf):
     """Create a Pylons WSGI application and return it
 
     ``global_conf``
         The inherited configuration for this application. Normally from
         the [DEFAULT] section of the Paste ini file.
 
-    ``full_stack``
-        Whether or not this application provides a full WSGI stack (by
-        default, meaning it handles its own exceptions and errors).
-        Disable full_stack when this application is "managed" by
-        another WSGI middleware.
-
     ``app_conf``
         The application's local configuration. Normally specified in
         the [app:<name>] section of the Paste ini file (where <name>
@@ -89,16 +112,6 b' def make_app(global_conf, full_stack=Tru'
         app = csrf.OriginChecker(app, expected_origin,
                                  skip_urls=[routes.util.url_for('api')])
 
-
-    if asbool(full_stack):
-
-        # Appenlight monitoring and error handler
-        app, appenlight_client = wrap_in_appenlight_if_enabled(app, config)
-
-        # we want our low level middleware to get to the request ASAP. We don't
-        # need any pylons stack middleware in them
-        app = VCSMiddleware(app, config, appenlight_client)
-
     # Establish the Registry for this application
     app = RegistryManager(app)
 
@@ -140,13 +153,78 b' def make_pyramid_app(global_config, **se'
 
     load_pyramid_environment(global_config, settings)
 
+    includeme_first(config)
     includeme(config)
-    includeme_last(config)
     pyramid_app = config.make_wsgi_app()
     pyramid_app = wrap_app_in_wsgi_middlewares(pyramid_app, config)
+    pyramid_app.config = config
     return pyramid_app
 
 
+def make_not_found_view(config):
+    """
+    This creates the view which should be registered as not-found-view to
+    pyramid. Basically it contains of the old pylons app, converted to a view.
+    Additionally it is wrapped by some other middlewares.
+    """
+    settings = config.registry.settings
+    vcs_server_enabled = settings['vcs.server.enable']
+
+    # Make pylons app from unprepared settings.
+    pylons_app = make_app(
+        config.registry._pylons_compat_global_config,
+        **config.registry._pylons_compat_settings)
+    config.registry._pylons_compat_config = pylons_app.config
+
+    # Appenlight monitoring.
+    pylons_app, appenlight_client = wrap_in_appenlight_if_enabled(
+        pylons_app, settings)
+
+    # The VCSMiddleware shall operate like a fallback if pyramid doesn't find
+    # a view to handle the request. Therefore we wrap it around the pylons app.
+    if vcs_server_enabled:
+        pylons_app = VCSMiddleware(
+            pylons_app, settings, appenlight_client, registry=config.registry)
+
+    pylons_app_as_view = wsgiapp(pylons_app)
+
+    # Protect from VCS Server error related pages when server is not available
+    if not vcs_server_enabled:
+        pylons_app_as_view = DisableVCSPagesWrapper(pylons_app_as_view)
+
+    def pylons_app_with_error_handler(context, request):
+        """
+        Handle exceptions from rc pylons app:
+
+        - old webob type exceptions get converted to pyramid exceptions
+        - pyramid exceptions are passed to the error handler view
+        """
+        def is_vcs_response(response):
+            return 'X-RhodeCode-Backend' in response.headers
+
+        def is_http_error(response):
+            # webob type error responses
+            return (400 <= response.status_int <= 599)
+
+        def is_error_handling_needed(response):
+            return is_http_error(response) and not is_vcs_response(response)
+
+        try:
+            response = pylons_app_as_view(context, request)
+            if is_error_handling_needed(response):
+                response = webob_to_pyramid_http_response(response)
+                return error_handler(response, request)
+        except HTTPError as e:  # pyramid type exceptions
+            return error_handler(e, request)
+        except Exception:
+            if settings.get('debugtoolbar.enabled', False):
+                raise
+            return error_handler(HTTPInternalServerError(), request)
+        return response
+
+    return pylons_app_with_error_handler
+
+
 def add_pylons_compat_data(registry, global_config, settings):
     """
     Attach data to the registry to support the Pylons integration.
@@ -205,20 +283,32 b' def error_handler(exception, request):'
 def includeme(config):
     settings = config.registry.settings
 
+    # plugin information
+    config.registry.rhodecode_plugins = OrderedDict()
+
+    config.add_directive(
+        'register_rhodecode_plugin', register_rhodecode_plugin)
+
     if asbool(settings.get('appenlight', 'false')):
         config.include('appenlight_client.ext.pyramid_tween')
 
     # Includes which are required. The application would fail without them.
     config.include('pyramid_mako')
     config.include('pyramid_beaker')
+    config.include('rhodecode.channelstream')
     config.include('rhodecode.admin')
     config.include('rhodecode.authentication')
+    config.include('rhodecode.integrations')
     config.include('rhodecode.login')
     config.include('rhodecode.tweens')
     config.include('rhodecode.api')
+    config.include('rhodecode.svn_support')
     config.add_route(
         'rhodecode_support', 'https://rhodecode.com/help/', static=True)
 
+    # Add subscribers.
+    config.add_subscriber(scan_repositories_if_enabled, ApplicationCreated)
+
     # Set the authorization policy.
     authz_policy = ACLAuthorizationPolicy()
     config.set_authorization_policy(authz_policy)
@@ -226,86 +316,37 b' def includeme(config):'
     # Set the default renderer for HTML templates to mako.
     config.add_mako_renderer('.html')
 
-    # plugin information
-    config.registry.rhodecode_plugins = {}
-
-    config.add_directive(
-        'register_rhodecode_plugin', register_rhodecode_plugin)
     # include RhodeCode plugins
     includes = aslist(settings.get('rhodecode.includes', []))
     for inc in includes:
         config.include(inc)
 
-    pylons_app = make_app(
-        config.registry._pylons_compat_global_config,
-        **config.registry._pylons_compat_settings)
-    config.registry._pylons_compat_config = pylons_app.config
-
-    pylons_app_as_view = wsgiapp(pylons_app)
-
-    # Protect from VCS Server error related pages when server is not available
-    vcs_server_enabled = asbool(settings.get('vcs.server.enable', 'true'))
-    if not vcs_server_enabled:
-        pylons_app_as_view = DisableVCSPagesWrapper(pylons_app_as_view)
-
-
-    def pylons_app_with_error_handler(context, request):
-        """
-        Handle exceptions from rc pylons app:
-
-        - old webob type exceptions get converted to pyramid exceptions
-        - pyramid exceptions are passed to the error handler view
-        """
-        try:
-            response = pylons_app_as_view(context, request)
-            if 400 <= response.status_int <= 599: # webob type error responses
-                return error_handler(
-                    webob_to_pyramid_http_response(response), request)
-        except HTTPError as e: # pyramid type exceptions
-            return error_handler(e, request)
-        except Exception:
-            if settings.get('debugtoolbar.enabled', False):
-                raise
-            return error_handler(HTTPInternalServerError(), request)
-        return response
-
     # This is the glue which allows us to migrate in chunks. By registering the
     # pylons based application as the "Not Found" view in Pyramid, we will
     # fallback to the old application each time the new one does not yet know
     # how to handle a request.
-    config.add_notfound_view(pylons_app_with_error_handler)
+    config.add_notfound_view(make_not_found_view(config))
 
-    if settings.get('debugtoolbar.enabled', False):
-        # if toolbar, then only http type exceptions get caught and rendered
-        ExcClass = HTTPError
-    else:
+    if not settings.get('debugtoolbar.enabled', False):
         # if no toolbar, then any exception gets caught and rendered
-        ExcClass = Exception
-    config.add_view(error_handler, context=ExcClass)
+        config.add_view(error_handler, context=Exception)
+
+    config.add_view(error_handler, context=HTTPError)
 
 
-def includeme_last(config):
-    """
-    The static file catchall needs to be last in the view configuration.
-    """
-    settings = config.registry.settings
+def includeme_first(config):
+    # redirect automatic browser favicon.ico requests to correct place
+    def favicon_redirect(context, request):
+        return HTTPFound(
+            request.static_path('rhodecode:public/images/favicon.ico'))
 
-    # Note: johbo: I would prefer to register a prefix for static files at some
-    # point, e.g. move them under '_static/'. This would fully avoid that we
-    # can have name clashes with a repository name. Imaging someone calling his
-    # repo "css" ;-) Also having an external web server to serve out the static
-    # files seems to be easier to set up if they have a common prefix.
-    #
-    # Example: config.add_static_view('_static', path='rhodecode:public')
-    #
-    # It might be an option to register both paths for a while and then migrate
-    # over to the new location.
+    config.add_view(favicon_redirect, route_name='favicon')
+    config.add_route('favicon', '/favicon.ico')
 
-    # Serving static files with a catchall.
-    if settings['static_files']:
-        config.add_route('catchall_static', '/*subpath')
-        config.add_view(
-            static_view('rhodecode:public'), route_name='catchall_static')
+    config.add_static_view(
+        '_static/deform', 'deform:static')
+    config.add_static_view(
+        '_static/rhodecode', path='rhodecode:public', cache_max_age=3600 * 24)
 
 
 def wrap_app_in_wsgi_middlewares(pyramid_app, config):
@@ -322,19 +363,14 b' def wrap_app_in_wsgi_middlewares(pyramid'
     pyramid_app = HttpsFixup(pyramid_app, settings)
 
     # Add RoutesMiddleware to support the pylons compatibility tween during
-
     # migration to pyramid.
-    pyramid_app = RoutesMiddleware(
-        pyramid_app, config.registry._pylons_compat_config['routes.map'])
+    pyramid_app = SkippableRoutesMiddleware(
+        pyramid_app, config.registry._pylons_compat_config['routes.map'],
+        skip_prefixes=(STATIC_FILE_PREFIX, '/_debug_toolbar'))
 
-    if asbool(settings.get('appenlight', 'false')):
-        pyramid_app, _ = wrap_in_appenlight_if_enabled(
-            pyramid_app, config.registry._pylons_compat_config)
+    pyramid_app, _ = wrap_in_appenlight_if_enabled(pyramid_app, settings)
 
-    # TODO: johbo: Don't really see why we enable the gzip middleware when
-    # serving static files, might be something that should have its own setting
-    # as well?
-    if settings['static_files']:
+    if settings['gzip_responses']:
         pyramid_app = make_gzip_middleware(
             pyramid_app, settings, compress_level=1)
 
@@ -376,12 +412,63 b' def sanitize_settings_and_apply_defaults'
     # should allow to pass in a prefix.
     settings.setdefault('rhodecode.api.url', '/_admin/api')
 
-    _bool_setting(settings, 'vcs.server.enable', 'true')
-    _bool_setting(settings, 'static_files', 'true')
+    # Sanitize generic settings.
+    _list_setting(settings, 'default_encoding', 'UTF-8')
     _bool_setting(settings, 'is_test', 'false')
+    _bool_setting(settings, 'gzip_responses', 'false')
+
+    # Call split out functions that sanitize settings for each topic.
+    _sanitize_appenlight_settings(settings)
+    _sanitize_vcs_settings(settings)
 
     return settings
 
 
+def _sanitize_appenlight_settings(settings):
+    _bool_setting(settings, 'appenlight', 'false')
+
+
+def _sanitize_vcs_settings(settings):
+    """
+    Applies settings defaults and does type conversion for all VCS related
+    settings.
+    """
+    _string_setting(settings, 'vcs.svn.compatible_version', '')
+    _string_setting(settings, 'git_rev_filter', '--all')
+    _string_setting(settings, 'vcs.hooks.protocol', 'pyro4')
+    _string_setting(settings, 'vcs.server', '')
+    _string_setting(settings, 'vcs.server.log_level', 'debug')
+    _string_setting(settings, 'vcs.server.protocol', 'pyro4')
+    _bool_setting(settings, 'startup.import_repos', 'false')
+    _bool_setting(settings, 'vcs.hooks.direct_calls', 'false')
+    _bool_setting(settings, 'vcs.server.enable', 'true')
+    _bool_setting(settings, 'vcs.start_server', 'false')
+    _list_setting(settings, 'vcs.backends', 'hg, git, svn')
+    _int_setting(settings, 'vcs.connection_timeout', 3600)
+
+
+def _int_setting(settings, name, default):
+    settings[name] = int(settings.get(name, default))
+
+
 def _bool_setting(settings, name, default):
-    settings[name] = asbool(settings.get(name, default))
+    input = settings.get(name, default)
+    if isinstance(input, unicode):
+        input = input.encode('utf8')
+    settings[name] = asbool(input)
+
+
+def _list_setting(settings, name, default):
+    raw_value = settings.get(name, default)
+
+    old_separator = ','
+    if old_separator in raw_value:
+        # If we get a comma separated list, pass it to our own function.
+        settings[name] = rhodecode_aslist(raw_value, sep=old_separator)
+    else:
+        # Otherwise we assume it uses pyramids space/newline separation.
+        settings[name] = aslist(raw_value)
+
+
+def _string_setting(settings, name, default):
+    settings[name] = settings.get(name, default).lower()

rhodecode/config/routing.py

@@ -36,6 +36,7 b' from rhodecode.config import routing_lin'
 
 # prefix for non repository related links needs to be prefixed with `/`
 ADMIN_PREFIX = '/_admin'
+STATIC_FILE_PREFIX = '/_static'
 
 # Default requirements for URL parts
 URL_NAME_REQUIREMENTS = {
@@ -51,6 +52,19 b' URL_NAME_REQUIREMENTS = {'
 }
 
 
+def add_route_requirements(route_path, requirements):
+    """
+    Adds regex requirements to pyramid routes using a mapping dict
+
+    >>> add_route_requirements('/{action}/{id}', {'id': r'\d+'})
+    '/{action}/{id:\d+}'
+
+     """
+    for key, regex in requirements.items():
+        route_path = route_path.replace('{%s}' % key, '{%s:%s}' % (key, regex))
+    return route_path
+
+
 class JSRoutesMapper(Mapper):
     """
     Wrapper for routes.Mapper to make pyroutes compatible url definitions
@@ -546,6 +560,13 b' def make_map(config):'
                   action='my_account_auth_tokens_add', conditions={'method': ['POST']})
         m.connect('my_account_auth_tokens', '/my_account/auth_tokens',
                   action='my_account_auth_tokens_delete', conditions={'method': ['DELETE']})
+        m.connect('my_account_notifications', '/my_account/notifications',
+                  action='my_notifications',
+                  conditions={'method': ['GET']})
+        m.connect('my_account_notifications_toggle_visibility',
+                  '/my_account/toggle_visibility',
+                  action='my_notifications_toggle_visibility',
+                  conditions={'method': ['POST']})
 
     # NOTIFICATION REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
@@ -554,7 +575,6 b' def make_map(config):'
                   action='index', conditions={'method': ['GET']})
         m.connect('notifications_mark_all_read', '/notifications/mark_all_read',
                   action='mark_all_read', conditions={'method': ['POST']})
-
         m.connect('/notifications/{notification_id}',
                   action='update', conditions={'method': ['PUT']})
         m.connect('/notifications/{notification_id}',
@@ -850,7 +870,7 b' def make_map(config):'
                  conditions={'function': check_repo, 'method': ['DELETE']},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
-    rmap.connect('changeset_info', '/changeset_info/{repo_name}/{revision}',
+    rmap.connect('changeset_info', '/{repo_name}/changeset_info/{revision}',
                  controller='changeset', action='changeset_info',
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
@@ -1090,9 +1110,9 b' def make_map(config):'
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 
-    rmap.connect('files_metadata_list_home',
-                 '/{repo_name}/metadata_list/{revision}/{f_path}',
-                 controller='files', action='metadata_list',
+    rmap.connect('files_nodetree_full',
+                 '/{repo_name}/nodetree_full/{commit_id}/{f_path}',
+                 controller='files', action='nodetree_full',
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS, jsroute=True)
 

rhodecode/config/utils.py

@@ -49,22 +49,18 b' def configure_vcs(config):'
     Patch VCS config with some RhodeCode specific stuff
     """
     from rhodecode.lib.vcs import conf
-    from rhodecode.lib.utils2 import aslist
     conf.settings.BACKENDS = {
         'hg': 'rhodecode.lib.vcs.backends.hg.MercurialRepository',
         'git': 'rhodecode.lib.vcs.backends.git.GitRepository',
         'svn': 'rhodecode.lib.vcs.backends.svn.SubversionRepository',
     }
 
-    conf.settings.HG_USE_REBASE_FOR_MERGING = config.get(
-        'rhodecode_hg_use_rebase_for_merging', False)
-    conf.settings.GIT_REV_FILTER = shlex.split(
-        config.get('git_rev_filter', '--all').strip())
-    conf.settings.DEFAULT_ENCODINGS = aslist(config.get('default_encoding',
-                                                        'UTF-8'), sep=',')
-    conf.settings.ALIASES[:] = config.get('vcs.backends')
-    conf.settings.SVN_COMPATIBLE_VERSION = config.get(
-        'vcs.svn.compatible_version')
+    conf.settings.HOOKS_PROTOCOL = config['vcs.hooks.protocol']
+    conf.settings.HOOKS_DIRECT_CALLS = config['vcs.hooks.direct_calls']
+    conf.settings.GIT_REV_FILTER = shlex.split(config['git_rev_filter'])
+    conf.settings.DEFAULT_ENCODINGS = config['default_encoding']
+    conf.settings.ALIASES[:] = config['vcs.backends']
+    conf.settings.SVN_COMPATIBLE_VERSION = config['vcs.svn.compatible_version']
 
 
 def initialize_database(config):
@@ -90,8 +86,7 b' def initialize_test_environment(settings'
 
 
 def get_vcs_server_protocol(config):
-    protocol = config.get('vcs.server.protocol', 'pyro4')
-    return protocol
+    return config['vcs.server.protocol']
 
 
 def set_instance_id(config):

rhodecode/controllers/admin/gists.py

@@ -25,15 +25,18 b' gist controller for RhodeCode'
 
 import time
 import logging
-import traceback
+
 import formencode
+import peppercorn
 from formencode import htmlfill
 
 from pylons import request, response, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
+from webob.exc import HTTPNotFound, HTTPForbidden
+from sqlalchemy.sql.expression import or_
 
-from rhodecode.model.forms import GistForm
+
 from rhodecode.model.gist import GistModel
 from rhodecode.model.meta import Session
 from rhodecode.model.db import Gist, User
@@ -44,9 +47,10 b' from rhodecode.lib.auth import LoginRequ'
 from rhodecode.lib.utils import jsonify
 from rhodecode.lib.utils2 import safe_str, safe_int, time_to_datetime
 from rhodecode.lib.ext_json import json
-from webob.exc import HTTPNotFound, HTTPForbidden
-from sqlalchemy.sql.expression import or_
 from rhodecode.lib.vcs.exceptions import VCSError, NodeNotChangedError
+from rhodecode.model import validation_schema
+from rhodecode.model.validation_schema.schemas import gist_schema
+
 
 log = logging.getLogger(__name__)
 
@@ -56,11 +60,11 b' class GistsController(BaseController):'
 
     def __load_defaults(self, extra_values=None):
         c.lifetime_values = [
-            (str(-1), _('forever')),
-            (str(5), _('5 minutes')),
-            (str(60), _('1 hour')),
-            (str(60 * 24), _('1 day')),
-            (str(60 * 24 * 30), _('1 month')),
+            (-1, _('forever')),
+            (5, _('5 minutes')),
+            (60, _('1 hour')),
+            (60 * 24, _('1 day')),
+            (60 * 24 * 30, _('1 month')),
         ]
         if extra_values:
             c.lifetime_values.append(extra_values)
@@ -136,40 +140,56 b' class GistsController(BaseController):'
         """POST /admin/gists: Create a new item"""
         # url('gists')
         self.__load_defaults()
-        gist_form = GistForm([x[0] for x in c.lifetime_values],
-                             [x[0] for x in c.acl_options])()
+
+        data = dict(request.POST)
+        data['filename'] = data.get('filename') or Gist.DEFAULT_FILENAME
+        data['nodes'] = [{
+            'filename': data['filename'],
+            'content': data.get('content'),
+            'mimetype': data.get('mimetype')  # None is autodetect
+        }]
+
+        data['gist_type'] = (
+            Gist.GIST_PUBLIC if data.get('public') else Gist.GIST_PRIVATE)
+        data['gist_acl_level'] = (
+            data.get('gist_acl_level') or Gist.ACL_LEVEL_PRIVATE)
+
+        schema = gist_schema.GistSchema().bind(
+            lifetime_options=[x[0] for x in c.lifetime_values])
+
         try:
-            form_result = gist_form.to_python(dict(request.POST))
-            # TODO: multiple files support, from the form
-            filename = form_result['filename'] or Gist.DEFAULT_FILENAME
-            nodes = {
-                filename: {
-                    'content': form_result['content'],
-                    'lexer': form_result['mimetype']  # None is autodetect
-                }
-            }
-            _public = form_result['public']
-            gist_type = Gist.GIST_PUBLIC if _public else Gist.GIST_PRIVATE
-            gist_acl_level = form_result.get(
-                'acl_level', Gist.ACL_LEVEL_PRIVATE)
+
+            schema_data = schema.deserialize(data)
+            # convert to safer format with just KEYs so we sure no duplicates
+            schema_data['nodes'] = gist_schema.sequence_to_nodes(
+                schema_data['nodes'])
+
             gist = GistModel().create(
-                description=form_result['description'],
+                gist_id=schema_data['gistid'],  # custom access id not real ID
+                description=schema_data['description'],
                 owner=c.rhodecode_user.user_id,
-                gist_mapping=nodes,
-                gist_type=gist_type,
-                lifetime=form_result['lifetime'],
-                gist_id=form_result['gistid'],
-                gist_acl_level=gist_acl_level
+                gist_mapping=schema_data['nodes'],
+                gist_type=schema_data['gist_type'],
+                lifetime=schema_data['lifetime'],
+                gist_acl_level=schema_data['gist_acl_level']
             )
             Session().commit()
             new_gist_id = gist.gist_access_id
-        except formencode.Invalid as errors:
-            defaults = errors.value
+        except validation_schema.Invalid as errors:
+            defaults = data
+            errors = errors.asdict()
+
+            if 'nodes.0.content' in errors:
+                errors['content'] = errors['nodes.0.content']
+                del errors['nodes.0.content']
+            if 'nodes.0.filename' in errors:
+                errors['filename'] = errors['nodes.0.filename']
+                del errors['nodes.0.filename']
 
             return formencode.htmlfill.render(
                 render('admin/gists/new.html'),
                 defaults=defaults,
-                errors=errors.error_dict or {},
+                errors=errors,
                 prefix_error=False,
                 encoding="UTF-8",
                 force_defaults=False
@@ -243,7 +263,8 b' class GistsController(BaseController):'
             log.exception("Exception in gist show")
             raise HTTPNotFound()
         if format == 'raw':
-            content = '\n\n'.join([f.content for f in c.files if (f_path is None or f.path == f_path)])
+            content = '\n\n'.join([f.content for f in c.files
+                                   if (f_path is None or f.path == f_path)])
             response.content_type = 'text/plain'
             return content
         return render('admin/gists/show.html')
@@ -252,32 +273,35 b' class GistsController(BaseController):'
     @NotAnonymous()
     @auth.CSRFRequired()
     def edit(self, gist_id):
+        self.__load_defaults()
         self._add_gist_to_context(gist_id)
 
         owner = c.gist.gist_owner == c.rhodecode_user.user_id
         if not (h.HasPermissionAny('hg.admin')() or owner):
             raise HTTPForbidden()
 
-        rpost = request.POST
-        nodes = {}
-        _file_data = zip(rpost.getall('org_files'), rpost.getall('files'),
-                         rpost.getall('mimetypes'), rpost.getall('contents'))
-        for org_filename, filename, mimetype, content in _file_data:
-            nodes[org_filename] = {
-                'org_filename': org_filename,
-                'filename': filename,
-                'content': content,
-                'lexer': mimetype,
-            }
+        data = peppercorn.parse(request.POST.items())
+
+        schema = gist_schema.GistSchema()
+        schema = schema.bind(
+            # '0' is special value to leave lifetime untouched
+            lifetime_options=[x[0] for x in c.lifetime_values] + [0],
+        )
+
         try:
+            schema_data = schema.deserialize(data)
+            # convert to safer format with just KEYs so we sure no duplicates
+            schema_data['nodes'] = gist_schema.sequence_to_nodes(
+                schema_data['nodes'])
+
             GistModel().update(
                 gist=c.gist,
-                description=rpost['description'],
+                description=schema_data['description'],
                 owner=c.gist.owner,
-                gist_mapping=nodes,
-                gist_type=c.gist.gist_type,
-                lifetime=rpost['lifetime'],
-                gist_acl_level=rpost['acl_level']
+                gist_mapping=schema_data['nodes'],
+                gist_type=schema_data['gist_type'],
+                lifetime=schema_data['lifetime'],
+                gist_acl_level=schema_data['gist_acl_level']
             )
 
             Session().commit()
@@ -287,6 +311,10 b' class GistsController(BaseController):'
             # store only DB stuff for gist
             Session().commit()
             h.flash(_('Successfully updated gist data'), category='success')
+        except validation_schema.Invalid as errors:
+            errors = errors.asdict()
+            h.flash(_('Error occurred during update of gist {}: {}').format(
+                gist_id, errors), category='error')
         except Exception:
             log.exception("Exception in gist edit")
             h.flash(_('Error occurred during update of gist %s') % gist_id,
@@ -317,7 +345,7 b' class GistsController(BaseController):'
             # this cannot use timeago, since it's used in select2 as a value
             expiry = h.age(h.time_to_datetime(c.gist.gist_expires))
         self.__load_defaults(
-            extra_values=('0', _('%(expiry)s - current value') % {'expiry': expiry}))
+            extra_values=(0, _('%(expiry)s - current value') % {'expiry': expiry}))
         return render('admin/gists/edit.html')
 
     @LoginRequired()

rhodecode/controllers/admin/my_account.py

@@ -346,3 +346,17 b' class MyAccountController(BaseController'
             h.flash(_("Auth token successfully deleted"), category='success')
 
         return redirect(url('my_account_auth_tokens'))
+
+    def my_notifications(self):
+        c.active = 'notifications'
+        return render('admin/my_account/my_account.html')
+
+    @auth.CSRFRequired()
+    def my_notifications_toggle_visibility(self):
+        user = c.rhodecode_user.get_instance()
+        user_data = user.user_data
+        status = user_data.get('notification_status', False)
+        user_data['notification_status'] = not status
+        user.user_data = user_data
+        Session().commit()
+        return redirect(url('my_account_notifications'))

rhodecode/controllers/admin/notifications.py

@@ -86,6 +86,7 b' class NotificationsController(BaseContro'
 
         return render('admin/notifications/notifications.html')
 
+
     @auth.CSRFRequired()
     def mark_all_read(self):
         if request.is_xhr:

rhodecode/controllers/admin/repos.py

@@ -33,6 +33,7 b' from pylons.controllers.util import redi'
 from pylons.i18n.translation import _
 from webob.exc import HTTPForbidden, HTTPNotFound, HTTPBadRequest
 
+import rhodecode
 from rhodecode.lib import auth, helpers as h
 from rhodecode.lib.auth import (
     LoginRequired, HasPermissionAllDecorator,
@@ -42,7 +43,7 b' from rhodecode.lib.base import BaseRepoC'
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.exceptions import AttachedForksError
 from rhodecode.lib.utils import action_logger, repo_name_slug, jsonify
-from rhodecode.lib.utils2 import safe_int
+from rhodecode.lib.utils2 import safe_int, str2bool
 from rhodecode.lib.vcs import RepositoryError
 from rhodecode.model.db import (
     User, Repository, UserFollowing, RepoGroup, RepositoryField)
@@ -779,6 +780,8 b' class ReposController(BaseRepoController'
         c.repo_info = self._load_repo(repo_name)
         defaults = self._vcs_form_defaults(repo_name)
         c.inherit_global_settings = defaults['inherit_global_settings']
+        c.labs_active = str2bool(
+            rhodecode.CONFIG.get('labs_settings_active', 'true'))
 
         return htmlfill.render(
             render('admin/repos/repo_edit.html'),

rhodecode/controllers/admin/settings.py

@@ -79,7 +79,7 b' class SettingsController(BaseController)'
     def __before__(self):
         super(SettingsController, self).__before__()
         c.labs_active = str2bool(
-            rhodecode.CONFIG.get('labs_settings_active', 'false'))
+            rhodecode.CONFIG.get('labs_settings_active', 'true'))
         c.navlist = navigation_list(request)
 
     def _get_hg_ui_settings(self):
@@ -790,13 +790,6 b' LabSetting = collections.namedtuple('
 # rhodecode.model.forms.LabsSettingsForm.
 _LAB_SETTINGS = [
     LabSetting(
-        key='rhodecode_hg_use_rebase_for_merging',
-        type='bool',
-        group=lazy_ugettext('Mercurial server-side merge'),
-        label=lazy_ugettext('Use rebase instead of creating a merge commit when merging via web interface'),
-        help=''  # Do not translate the empty string!
-    ),
-    LabSetting(
         key='rhodecode_proxy_subversion_http_requests',
         type='bool',
         group=lazy_ugettext('Subversion HTTP Support'),

rhodecode/controllers/admin/users.py

@@ -83,9 +83,6 b' class UsersController(BaseController):'
         from rhodecode.lib.utils import PartialRenderer
         _render = PartialRenderer('data_table/_dt_elements.html')
 
-        def grav_tmpl(user_email, size):
-            return _render("user_gravatar", user_email, size)
-
         def username(user_id, username):
             return _render("user_name", user_id, username)
 
@@ -100,9 +97,7 b' class UsersController(BaseController):'
         users_data = []
         for user in c.users_list:
             users_data.append({
-                "gravatar": grav_tmpl(user.email, 20),
-                "username": h.link_to(
-                    user.username, h.url('user_profile', username=user.username)),
+                "username": h.gravatar_with_user(user.username),
                 "username_raw": user.username,
                 "email": user.email,
                 "first_name": h.escape(user.name),

rhodecode/controllers/changeset.py

@@ -351,7 +351,8 b' class ChangesetController(BaseRepoContro'
                 f_path=request.POST.get('f_path'),
                 line_no=request.POST.get('line'),
                 status_change=(ChangesetStatus.get_status_lbl(status)
-                               if status else None)
+                               if status else None),
+                status_change_type=status
             )
             # get status if set !
             if status:

rhodecode/controllers/files.py

@@ -136,11 +136,13 b' class FilesController(BaseRepoController'
         _namespace = caches.get_repo_namespace_key(namespace_type, repo_name)
         return caches.get_cache_manager('repo_cache_long', _namespace)
 
-    def _get_tree_at_commit(self, repo_name, commit_id, f_path):
+    def _get_tree_at_commit(self, repo_name, commit_id, f_path,
+                            full_load=False, force=False):
         def _cached_tree():
             log.debug('Generating cached file tree for %s, %s, %s',
                       repo_name, commit_id, f_path)
-            return render('files/files_browser.html')
+            c.full_load = full_load
+            return render('files/files_browser_tree.html')
 
         cache_manager = self.__get_tree_cache_manager(
             repo_name, caches.FILE_TREE)
@@ -148,6 +150,10 b' class FilesController(BaseRepoController'
         cache_key = caches.compute_key_from_params(
             repo_name, commit_id, f_path)
 
+        if force:
+            # we want to force recompute of caches
+            cache_manager.remove_value(cache_key)
+
         return cache_manager.get(cache_key, createfunc=_cached_tree)
 
     def _get_nodelist_at_commit(self, repo_name, commit_id, f_path):
@@ -165,22 +171,6 b' class FilesController(BaseRepoController'
             repo_name, commit_id, f_path)
         return cache_manager.get(cache_key, createfunc=_cached_nodes)
 
-    def _get_metadata_at_commit(self, repo_name, commit, dir_node):
-        def _cached_metadata():
-            log.debug('Generating cached metadata for %s, %s, %s',
-                      repo_name, commit.raw_id, safe_str(dir_node.path))
-
-            data = ScmModel().get_dirnode_metadata(commit, dir_node)
-            return data
-
-        cache_manager = self.__get_tree_cache_manager(
-            repo_name, caches.FILE_TREE_META)
-
-        cache_key = caches.compute_key_from_params(
-            repo_name, commit.raw_id, safe_str(dir_node.path))
-
-        return cache_manager.get(cache_key, createfunc=_cached_metadata)
-
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
@@ -246,6 +236,7 b' class FilesController(BaseRepoController'
                 c.authors = []
                 c.file_tree = self._get_tree_at_commit(
                     repo_name, c.commit.raw_id, f_path)
+
         except RepositoryError as e:
             h.flash(safe_str(e), category='error')
             raise HTTPNotFound()
@@ -1092,23 +1083,32 b' class FilesController(BaseRepoController'
     @XHRRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
-    @jsonify
-    def metadata_list(self, repo_name, revision, f_path):
+    def nodetree_full(self, repo_name, commit_id, f_path):
         """
-        Returns a json dict that contains commit date, author, revision
-        and id for the specified repo, revision and file path
+        Returns rendered html of file tree that contains commit date,
+        author, revision for the specified combination of
+        repo, commit_id and file path
 
         :param repo_name: name of the repository
-        :param revision: revision of files
+        :param commit_id: commit_id of file tree
         :param f_path: file path of the requested directory
         """
 
-        commit = self.__get_commit_or_redirect(revision, repo_name)
+        commit = self.__get_commit_or_redirect(commit_id, repo_name)
         try:
-            file_node = commit.get_node(f_path)
+            dir_node = commit.get_node(f_path)
         except RepositoryError as e:
-            return {'error': safe_str(e)}
+            return 'error {}'.format(safe_str(e))
+
+        if dir_node.is_file():
+            return ''
 
-        metadata = self._get_metadata_at_commit(
-            repo_name, commit, file_node)
-        return {'metadata': metadata}
+        c.file = dir_node
+        c.commit = commit
+
+        # using force=True here, make a little trick. We flush the cache and
+        # compute it using the same key as without full_load, so the fully
+        # loaded cached tree is now returned instead of partial
+        return self._get_tree_at_commit(
+            repo_name, commit.raw_id, dir_node.path, full_load=True,
+            force=True)

rhodecode/controllers/journal.py

@@ -244,7 +244,7 b' class JournalController(BaseController):'
             try:
                 self.scm_model.toggle_following_user(
                     user_id, c.rhodecode_user.user_id)
-                Session.commit()
+                Session().commit()
                 return 'ok'
             except Exception:
                 raise HTTPBadRequest()
@@ -254,7 +254,7 b' class JournalController(BaseController):'
             try:
                 self.scm_model.toggle_following_repo(
                     repo_id, c.rhodecode_user.user_id)
-                Session.commit()
+                Session().commit()
                 return 'ok'
             except Exception:
                 raise HTTPBadRequest()

rhodecode/controllers/pullrequests.py

@@ -32,6 +32,7 b' from pylons.i18n.translation import _'
 from sqlalchemy.sql import func
 from sqlalchemy.sql.expression import or_
 
+from rhodecode import events
 from rhodecode.lib import auth, diffs, helpers as h
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.base import (
@@ -640,6 +641,9 b' class PullrequestsController(BaseRepoCon'
         pull_request_id = safe_int(pull_request_id)
         c.pull_request = PullRequest.get_or_404(pull_request_id)
 
+        c.template_context['pull_request_data']['pull_request_id'] = \
+            pull_request_id
+
         # pull_requests repo_name we opened it against
         # ie. target_repo must match
         if repo_name != c.pull_request.target_repo.repo_name:
@@ -758,9 +762,13 b' class PullrequestsController(BaseRepoCon'
             line_no=request.POST.get('line'),
             status_change=(ChangesetStatus.get_status_lbl(status)
                            if status and allowed_to_change_status else None),
+            status_change_type=(status
+                                if status and allowed_to_change_status else None),
             closing_pr=close_pr
         )
 
+
+
         if allowed_to_change_status:
             old_calculated_status = pull_request.calculated_review_status()
             # get status if set !
@@ -774,6 +782,7 b' class PullrequestsController(BaseRepoCon'
                 )
 
             Session().flush()
+            events.trigger(events.PullRequestCommentEvent(pull_request, comm))
             # we now calculate the status of pull request, and based on that
             # calculation we set the commits status
             calculated_status = pull_request.calculated_review_status()

rhodecode/controllers/search.py

@@ -35,6 +35,7 b' from rhodecode.lib.helpers import Page'
 from rhodecode.lib.utils2 import safe_str, safe_int
 from rhodecode.lib.index import searcher_from_config
 from rhodecode.model import validation_schema
+from rhodecode.model.validation_schema.schemas import search_schema
 
 log = logging.getLogger(__name__)
 
@@ -48,7 +49,7 b' class SearchController(BaseRepoControlle'
         formatted_results = []
         execution_time = ''
 
-        schema = validation_schema.SearchParamsSchema()
+        schema = search_schema.SearchParamsSchema()
 
         search_params = {}
         errors = []
@@ -75,7 +76,6 b' class SearchController(BaseRepoControlle'
             page_limit = search_params['page_limit']
             requested_page = search_params['requested_page']
 
-
             c.perm_user = AuthUser(user_id=c.rhodecode_user.user_id,
                                    ip_addr=self.ip_addr)
 

rhodecode/controllers/summary.py

@@ -24,14 +24,12 b' Summary controller for RhodeCode Enterpr'
 
 import logging
 from string import lower
-from itertools import product
 
 from pylons import tmpl_context as c, request
 from pylons.i18n.translation import _
 from beaker.cache import cache_region, region_invalidate
 
-from rhodecode.config.conf import (
-    ALL_READMES, ALL_EXTS, LANGUAGES_EXTENSIONS_MAP)
+from rhodecode.config.conf import (LANGUAGES_EXTENSIONS_MAP)
 from rhodecode.controllers import utils
 from rhodecode.controllers.changelog import _load_changelog_summary
 from rhodecode.lib import caches, helpers as h
@@ -49,10 +47,6 b' from rhodecode.model.db import Statistic'
 
 log = logging.getLogger(__name__)
 
-README_FILES = [''.join([x[0][0], x[1][0]])
-                for x in sorted(list(product(ALL_READMES, ALL_EXTS)),
-                                key=lambda y:y[0][1] + y[1][1])]
-
 
 class SummaryController(BaseRepoController):
 
@@ -62,6 +56,7 b' class SummaryController(BaseRepoControll'
     def __get_readme_data(self, db_repo):
         repo_name = db_repo.repo_name
         log.debug('Looking for README file')
+        default_renderer = c.visual.default_renderer
 
         @cache_region('long_term')
         def _generate_readme(cache_key):
@@ -73,7 +68,7 b' class SummaryController(BaseRepoControll'
                 if isinstance(commit, EmptyCommit):
                     raise EmptyRepositoryError()
                 renderer = MarkupRenderer()
-                for f in README_FILES:
+                for f in renderer.pick_readme_order(default_renderer):
                     try:
                         node = commit.get_node(f)
                     except NodeDoesNotExistError:
@@ -241,7 +236,7 b' class SummaryController(BaseRepoControll'
             (_("Tag"), repo.tags, 'tag'),
             (_("Bookmark"), repo.bookmarks, 'book'),
         ]
-        res = self._create_reference_data(repo, refs_to_create)
+        res = self._create_reference_data(repo, repo_name, refs_to_create)
         data = {
             'more': False,
             'results': res
@@ -258,14 +253,14 b' class SummaryController(BaseRepoControll'
             # TODO: enable when vcs can handle bookmarks filters
             # (_("Bookmarks"), repo.bookmarks, "book"),
         ]
-        res = self._create_reference_data(repo, refs_to_create)
+        res = self._create_reference_data(repo, repo_name, refs_to_create)
         data = {
             'more': False,
             'results': res
         }
         return data
 
-    def _create_reference_data(self, repo, refs_to_create):
+    def _create_reference_data(self, repo, full_repo_name, refs_to_create):
         format_ref_id = utils.get_format_ref_id(repo)
 
         result = []
@@ -274,28 +269,32 b' class SummaryController(BaseRepoControll'
                 result.append({
                     'text': title,
                     'children': self._create_reference_items(
-                        repo, refs, ref_type, format_ref_id),
+                        repo, full_repo_name, refs, ref_type, format_ref_id),
                 })
         return result
 
-    def _create_reference_items(self, repo, refs, ref_type, format_ref_id):
+    def _create_reference_items(self, repo, full_repo_name, refs, ref_type,
+                                format_ref_id):
         result = []
         is_svn = h.is_svn(repo)
-        for name, raw_id in refs.iteritems():
+        for ref_name, raw_id in refs.iteritems():
+            files_url = self._create_files_url(
+                repo, full_repo_name, ref_name, raw_id, is_svn)
             result.append({
-                'text': name,
-                'id': format_ref_id(name, raw_id),
+                'text': ref_name,
+                'id': format_ref_id(ref_name, raw_id),
                 'raw_id': raw_id,
                 'type': ref_type,
-                'files_url': self._create_files_url(repo, name, raw_id, is_svn)
+                'files_url': files_url,
             })
         return result
 
-    def _create_files_url(self, repo, name, raw_id, is_svn):
-        use_commit_id = '/' in name or is_svn
+    def _create_files_url(self, repo, full_repo_name, ref_name, raw_id,
+                          is_svn):
+        use_commit_id = '/' in ref_name or is_svn
         return h.url(
             'files_home',
-            repo_name=repo.name,
-            f_path=name if is_svn else '',
-            revision=raw_id if use_commit_id else name,
-            at=name)
+            repo_name=full_repo_name,
+            f_path=ref_name if is_svn else '',
+            revision=raw_id if use_commit_id else ref_name,
+            at=ref_name)

rhodecode/events/user.py

@@ -17,37 +17,49 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 from zope.interface import implementer
-from rhodecode.interfaces import (
+
+from rhodecode.translation import lazy_ugettext
+from rhodecode.events.base import RhodecodeEvent
+from rhodecode.events.interfaces import (
     IUserRegistered, IUserPreCreate, IUserPreUpdate)
 
 
 @implementer(IUserRegistered)
-class UserRegistered(object):
+class UserRegistered(RhodecodeEvent):
     """
     An instance of this class is emitted as an :term:`event` whenever a user
     account is registered.
     """
+    name = 'user-register'
+    display_name = lazy_ugettext('user registered')
+
     def __init__(self, user, session):
         self.user = user
         self.session = session
 
 
 @implementer(IUserPreCreate)
-class UserPreCreate(object):
+class UserPreCreate(RhodecodeEvent):
     """
     An instance of this class is emitted as an :term:`event` before a new user
     object is created.
     """
+    name = 'user-pre-create'
+    display_name = lazy_ugettext('user pre create')
+
     def __init__(self, user_data):
         self.user_data = user_data
 
 
 @implementer(IUserPreUpdate)
-class UserPreUpdate(object):
+class UserPreUpdate(RhodecodeEvent):
     """
     An instance of this class is emitted as an :term:`event` before a user
     object is updated.
     """
+    name = 'user-pre-update'
+    display_name = lazy_ugettext('user pre update')
+
     def __init__(self, user, user_data):
         self.user = user
         self.user_data = user_data

rhodecode/i18n/rhodecode.pot

@@ -6,9 +6,9 b''
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rhodecode-enterprise-ce 4.2.0\n"
+"Project-Id-Version: rhodecode-enterprise-ce 4.3.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2016-06-30 17:18+0000\n"
+"POT-Creation-Date: 2016-08-02 20:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,12 +18,13 b' msgstr ""'
 "Generated-By: Babel 1.3\n"
 
 #: rhodecode/admin/navigation.py:74 rhodecode/authentication/routes.py:60
+#: rhodecode/integrations/views.py:126
 #: rhodecode/templates/admin/permissions/permissions.html:36
 msgid "Global"
 msgstr ""
 
 #: rhodecode/admin/navigation.py:75
-#: rhodecode/templates/admin/repos/repo_edit.html:48
+#: rhodecode/templates/admin/repos/repo_edit.html:52
 msgid "VCS"
 msgstr ""
 
@@ -36,7 +37,7 b' msgid "Remap and Rescan"'
 msgstr ""
 
 #: rhodecode/admin/navigation.py:78
-#: rhodecode/templates/admin/repos/repo_edit.html:54
+#: rhodecode/templates/admin/repos/repo_edit.html:58
 msgid "Issue Tracker"
 msgstr ""
 
@@ -45,7 +46,8 b' msgstr ""'
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:94
 #: rhodecode/templates/admin/users/user_add.html:86
 #: rhodecode/templates/admin/users/user_edit_profile.html:65
-#: rhodecode/templates/admin/users/users.html:91
+#: rhodecode/templates/admin/users/users.html:90
+#: rhodecode/templates/email_templates/user_registration.mako:25
 #: rhodecode/templates/users/user_profile.html:51
 msgid "Email"
 msgstr ""
@@ -59,15 +61,27 b' msgid "Full Text Search"'
 msgstr ""
 
 #: rhodecode/admin/navigation.py:83
+#: rhodecode/templates/admin/integrations/base.html:21
+#: rhodecode/templates/admin/integrations/edit.html:8
+#: rhodecode/templates/admin/integrations/edit.html:19
+#: rhodecode/templates/admin/integrations/list.html:15
+#: rhodecode/templates/admin/integrations/list.html:19
+#: rhodecode/templates/admin/integrations/list.html:26
+#: rhodecode/templates/admin/repos/repo_edit.html:72
+#: rhodecode/templates/base/base.html:84
+msgid "Integrations"
+msgstr ""
+
+#: rhodecode/admin/navigation.py:85
 #: rhodecode/templates/admin/settings/settings_system.html:47
 msgid "System Info"
 msgstr ""
 
-#: rhodecode/admin/navigation.py:84
+#: rhodecode/admin/navigation.py:86
 msgid "Open Source Licenses"
 msgstr ""
 
-#: rhodecode/admin/navigation.py:91
+#: rhodecode/admin/navigation.py:93
 msgid "Labs"
 msgstr ""
 
@@ -75,7 +89,9 b' msgstr ""'
 msgid "Enable or disable this authentication plugin."
 msgstr ""
 
-#: rhodecode/authentication/schema.py:37
+#: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:37
+#: rhodecode/templates/admin/integrations/list.html:62
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:14
 msgid "Enabled"
 msgstr ""
 
@@ -217,7 +233,7 b' msgstr ""'
 #: rhodecode/templates/login.html:50 rhodecode/templates/register.html:48
 #: rhodecode/templates/admin/my_account/my_account.html:30
 #: rhodecode/templates/admin/users/user_add.html:44
-#: rhodecode/templates/base/base.html:314
+#: rhodecode/templates/base/base.html:315
 #: rhodecode/templates/debug_style/login.html:45
 msgid "Password"
 msgstr ""
@@ -266,12 +282,12 b' msgstr ""'
 msgid "LDAP Attribute to map to user name"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:144
-msgid "The LDAP Login attribute of the CN must be specified"
+#: rhodecode/authentication/plugins/auth_ldap.py:145
+msgid "Login Attribute"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:146
-msgid "Login Attribute"
+msgid "The LDAP Login attribute of the CN must be specified"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:151
@@ -298,7 +314,7 b' msgstr ""'
 msgid "Email Attribute"
 msgstr ""
 
-#: rhodecode/authentication/plugins/auth_ldap.py:348
+#: rhodecode/authentication/plugins/auth_ldap.py:351
 msgid "LDAP"
 msgstr ""
 
@@ -331,7 +347,7 b' msgid "Rhodecode Token Auth"'
 msgstr ""
 
 #: rhodecode/controllers/changelog.py:90 rhodecode/controllers/compare.py:63
-#: rhodecode/controllers/pullrequests.py:279
+#: rhodecode/controllers/pullrequests.py:280
 msgid "There are no commits yet"
 msgstr ""
 
@@ -367,8 +383,8 b' msgid "No such commit exists for this re'
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:335
-#: rhodecode/controllers/pullrequests.py:746
-#: rhodecode/model/pull_request.py:836
+#: rhodecode/controllers/pullrequests.py:750
+#: rhodecode/model/pull_request.py:843
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr ""
@@ -423,100 +439,100 b' msgstr ""'
 msgid "There are no files yet. %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:390 rhodecode/controllers/files.py:443
-#: rhodecode/controllers/files.py:474 rhodecode/controllers/files.py:549
-#: rhodecode/controllers/files.py:594 rhodecode/controllers/files.py:685
+#: rhodecode/controllers/files.py:381 rhodecode/controllers/files.py:434
+#: rhodecode/controllers/files.py:465 rhodecode/controllers/files.py:540
+#: rhodecode/controllers/files.py:585 rhodecode/controllers/files.py:676
 #, python-format
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 
+#: rhodecode/controllers/files.py:389 rhodecode/controllers/files.py:442
+msgid "You can only delete files with revision being a valid branch "
+msgstr ""
+
 #: rhodecode/controllers/files.py:398 rhodecode/controllers/files.py:451
-msgid "You can only delete files with revision being a valid branch "
-msgstr ""
-
-#: rhodecode/controllers/files.py:407 rhodecode/controllers/files.py:460
 #, python-format
 msgid "Deleted file %s via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/controllers/files.py:427
+#: rhodecode/controllers/files.py:418
 #, python-format
 msgid "Successfully deleted file %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:430 rhodecode/controllers/files.py:536
-#: rhodecode/controllers/files.py:673
+#: rhodecode/controllers/files.py:421 rhodecode/controllers/files.py:527
+#: rhodecode/controllers/files.py:664
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:482 rhodecode/controllers/files.py:557
+#: rhodecode/controllers/files.py:473 rhodecode/controllers/files.py:548
 msgid "You can only edit files with revision being a valid branch "
 msgstr ""
 
-#: rhodecode/controllers/files.py:494 rhodecode/controllers/files.py:569
+#: rhodecode/controllers/files.py:485 rhodecode/controllers/files.py:560
 #, python-format
 msgid "Edited file %s via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/controllers/files.py:511
+#: rhodecode/controllers/files.py:502
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:533 rhodecode/controllers/files.py:662
+#: rhodecode/controllers/files.py:524 rhodecode/controllers/files.py:653
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:607 rhodecode/controllers/files.py:696
+#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:687
 msgid "Added file via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/controllers/files.py:632
+#: rhodecode/controllers/files.py:623
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/controllers/files.py:665
+#: rhodecode/controllers/files.py:656
 msgid "The location specified must be a relative path and must not contain .. in the path"
 msgstr ""
 
-#: rhodecode/controllers/files.py:719
+#: rhodecode/controllers/files.py:710
 msgid "Downloads disabled"
 msgstr ""
 
-#: rhodecode/controllers/files.py:725
+#: rhodecode/controllers/files.py:716
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:727
+#: rhodecode/controllers/files.py:718
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:729 rhodecode/controllers/files.py:763
+#: rhodecode/controllers/files.py:720 rhodecode/controllers/files.py:754
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:930
+#: rhodecode/controllers/files.py:921
 #, python-format
 msgid "Commit %(commit)s does not exist."
 msgstr ""
 
-#: rhodecode/controllers/files.py:947
+#: rhodecode/controllers/files.py:938
 #, python-format
 msgid "%(file_path)s has not changed between %(commit_1)s and %(commit_2)s."
 msgstr ""
 
-#: rhodecode/controllers/files.py:1014
+#: rhodecode/controllers/files.py:1005
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:1035 rhodecode/controllers/summary.py:256
-#: rhodecode/model/pull_request.py:1051 rhodecode/model/scm.py:783
+#: rhodecode/controllers/files.py:1026 rhodecode/controllers/summary.py:251
+#: rhodecode/model/pull_request.py:1059 rhodecode/model/scm.py:780
 #: rhodecode/templates/base/vcs_settings.html:138
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:1039 rhodecode/model/scm.py:798
+#: rhodecode/controllers/files.py:1030 rhodecode/model/scm.py:795
 #: rhodecode/templates/base/vcs_settings.html:163
 msgid "Tags"
 msgstr ""
@@ -531,13 +547,13 b' msgid "Groups"'
 msgstr ""
 
 #: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247
-#: rhodecode/controllers/pullrequests.py:382
+#: rhodecode/controllers/pullrequests.py:383
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:128
 #: rhodecode/templates/admin/repos/repo_add.html:15
 #: rhodecode/templates/admin/repos/repo_add.html:19
 #: rhodecode/templates/admin/users/user_edit_advanced.html:11
-#: rhodecode/templates/base/base.html:79 rhodecode/templates/base/base.html:149
-#: rhodecode/templates/base/base.html:626
+#: rhodecode/templates/base/base.html:78 rhodecode/templates/base/base.html:150
+#: rhodecode/templates/base/base.html:627
 msgid "Repositories"
 msgstr ""
 
@@ -554,93 +570,93 b' msgstr ""'
 msgid "journal"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:293
+#: rhodecode/controllers/pullrequests.py:294
 msgid "Commit does not exist"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:405
+#: rhodecode/controllers/pullrequests.py:406
 msgid "Pull request requires a title with min. 3 chars"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:407
+#: rhodecode/controllers/pullrequests.py:408
 msgid "Error creating pull request: {}"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:454
+#: rhodecode/controllers/pullrequests.py:455
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:457
+#: rhodecode/controllers/pullrequests.py:458
 msgid "Error occurred during sending pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:497
+#: rhodecode/controllers/pullrequests.py:498
 msgid "Cannot update closed pull requests."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:503
+#: rhodecode/controllers/pullrequests.py:504
 msgid "Pull request title & description updated."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:513
+#: rhodecode/controllers/pullrequests.py:514
 msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:523
+#: rhodecode/controllers/pullrequests.py:524
 msgid "Nothing changed in pull request."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:526
+#: rhodecode/controllers/pullrequests.py:527
 msgid "Skipping update of pull request due to reference type: {reference_type}"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:533
+#: rhodecode/controllers/pullrequests.py:534
 msgid "Update failed due to missing commits."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:579
+#: rhodecode/controllers/pullrequests.py:580
 msgid "Pull request reviewer approval is pending."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:593
+#: rhodecode/controllers/pullrequests.py:594
 msgid "Pull request was successfully merged and closed."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:631
+#: rhodecode/controllers/pullrequests.py:632
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:664
+#: rhodecode/controllers/pullrequests.py:668
 msgid "Reviewer approval is pending."
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:706
+#: rhodecode/controllers/pullrequests.py:710
 msgid "Close Pull Request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:750
-#: rhodecode/model/pull_request.py:840
+#: rhodecode/controllers/pullrequests.py:754
+#: rhodecode/model/pull_request.py:847
 msgid "Closing with"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:795
+#: rhodecode/controllers/pullrequests.py:802
 #, python-format
 msgid "Closing pull request on other statuses than rejected or approved is forbidden. Calculated status from all reviewers is currently: %s"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:240
+#: rhodecode/controllers/summary.py:235
 msgid "Branch"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:241
+#: rhodecode/controllers/summary.py:236
 msgid "Tag"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:242
+#: rhodecode/controllers/summary.py:237
 msgid "Bookmark"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:257
+#: rhodecode/controllers/summary.py:252
 msgid "Closed branches"
 msgstr ""
 
@@ -652,83 +668,87 b' msgstr ""'
 msgid "Error occurred during update of default values"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:59
+#: rhodecode/controllers/admin/gists.py:63
 #: rhodecode/controllers/admin/my_account.py:307
-#: rhodecode/controllers/admin/users.py:436
+#: rhodecode/controllers/admin/users.py:431
 msgid "forever"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:60
+#: rhodecode/controllers/admin/gists.py:64
 #: rhodecode/controllers/admin/my_account.py:308
-#: rhodecode/controllers/admin/users.py:437
+#: rhodecode/controllers/admin/users.py:432
 msgid "5 minutes"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:61
+#: rhodecode/controllers/admin/gists.py:65
 #: rhodecode/controllers/admin/my_account.py:309
-#: rhodecode/controllers/admin/users.py:438
+#: rhodecode/controllers/admin/users.py:433
 msgid "1 hour"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:62
+#: rhodecode/controllers/admin/gists.py:66
 #: rhodecode/controllers/admin/my_account.py:310
-#: rhodecode/controllers/admin/users.py:439
+#: rhodecode/controllers/admin/users.py:434
 msgid "1 day"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:63
-#: rhodecode/controllers/admin/my_account.py:311
-#: rhodecode/controllers/admin/users.py:440
-msgid "1 month"
-msgstr ""
-
 #: rhodecode/controllers/admin/gists.py:67
+#: rhodecode/controllers/admin/my_account.py:311
+#: rhodecode/controllers/admin/users.py:435
+msgid "1 month"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:71
 #: rhodecode/controllers/admin/my_account.py:313
-#: rhodecode/controllers/admin/users.py:442
+#: rhodecode/controllers/admin/users.py:437
 msgid "Lifetime"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:69
+#: rhodecode/controllers/admin/gists.py:73
 msgid "Requires registered account"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:70
+#: rhodecode/controllers/admin/gists.py:74
 msgid "Can be accessed by anonymous users"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:180
+#: rhodecode/controllers/admin/gists.py:200
 msgid "Error occurred during gist creation"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:211
+#: rhodecode/controllers/admin/gists.py:231
 #, python-format
 msgid "Deleted gist %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:284
+#: rhodecode/controllers/admin/gists.py:308
 msgid "Successfully updated gist content"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:289
+#: rhodecode/controllers/admin/gists.py:313
 msgid "Successfully updated gist data"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:292
+#: rhodecode/controllers/admin/gists.py:316
+msgid "Error occurred during update of gist {}: {}"
+msgstr ""
+
+#: rhodecode/controllers/admin/gists.py:320
 #, python-format
 msgid "Error occurred during update of gist %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:315
+#: rhodecode/controllers/admin/gists.py:343
 #: rhodecode/templates/admin/gists/show.html:67
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:19
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:42
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:16
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:38
-#: rhodecode/templates/data_table/_dt_elements.html:253
+#: rhodecode/templates/data_table/_dt_elements.html:255
 msgid "never"
 msgstr ""
 
-#: rhodecode/controllers/admin/gists.py:320
+#: rhodecode/controllers/admin/gists.py:348
 #, python-format
 msgid "%(expiry)s - current value"
 msgstr ""
@@ -742,7 +762,7 b' msgid "Your account was updated successf'
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:143
-#: rhodecode/controllers/admin/users.py:223
+#: rhodecode/controllers/admin/users.py:218
 #, python-format
 msgid "Error occurred during update of user %s"
 msgstr ""
@@ -756,38 +776,38 b' msgid "Error occurred during update of u'
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:261
-#: rhodecode/controllers/admin/users.py:616
+#: rhodecode/controllers/admin/users.py:611
 #, python-format
 msgid "Added new email address `%s` for user account"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:268
-#: rhodecode/controllers/admin/users.py:623
+#: rhodecode/controllers/admin/users.py:618
 msgid "An error occurred during email saving"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:278
-#: rhodecode/controllers/admin/users.py:638
+#: rhodecode/controllers/admin/users.py:633
 msgid "Removed email address from user account"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:316
-#: rhodecode/controllers/admin/users.py:445
+#: rhodecode/controllers/admin/users.py:440
 msgid "Role"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:329
-#: rhodecode/controllers/admin/users.py:469
+#: rhodecode/controllers/admin/users.py:464
 msgid "Auth token successfully created"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:342
-#: rhodecode/controllers/admin/users.py:488
+#: rhodecode/controllers/admin/users.py:483
 msgid "Auth token successfully reset"
 msgstr ""
 
 #: rhodecode/controllers/admin/my_account.py:346
-#: rhodecode/controllers/admin/users.py:492
+#: rhodecode/controllers/admin/users.py:487
 msgid "Auth token successfully deleted"
 msgstr ""
 
@@ -862,170 +882,170 b' msgstr ""'
 msgid "Repository Group permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:128
+#: rhodecode/controllers/admin/repos.py:129
 #, python-format
 msgid "Error creating repository %s: invalid certificate"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:132
+#: rhodecode/controllers/admin/repos.py:133
 #, python-format
 msgid "Error creating repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:264
+#: rhodecode/controllers/admin/repos.py:265
 #, python-format
 msgid "Created repository %s from %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:273
+#: rhodecode/controllers/admin/repos.py:274
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:276
+#: rhodecode/controllers/admin/repos.py:277
 #, python-format
 msgid "Created repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:318
+#: rhodecode/controllers/admin/repos.py:319
 #, python-format
 msgid "Repository %s updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:337
+#: rhodecode/controllers/admin/repos.py:338
 #, python-format
 msgid "Error occurred during update of repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:365
+#: rhodecode/controllers/admin/repos.py:366
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:368
+#: rhodecode/controllers/admin/repos.py:369
 #, python-format
 msgid "Deleted %s forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:373
+#: rhodecode/controllers/admin/repos.py:374
 #, python-format
 msgid "Deleted repository %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:376
+#: rhodecode/controllers/admin/repos.py:377
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:381
+#: rhodecode/controllers/admin/repos.py:382
 #, python-format
 msgid "An error occurred during deletion of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:435
+#: rhodecode/controllers/admin/repos.py:436
 msgid "Repository permissions updated"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:466
+#: rhodecode/controllers/admin/repos.py:467
 msgid "An error occurred during creation of field"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:481
+#: rhodecode/controllers/admin/repos.py:482
 msgid "An error occurred during removal of field"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:520
+#: rhodecode/controllers/admin/repos.py:521
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:524
+#: rhodecode/controllers/admin/repos.py:525
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:548
+#: rhodecode/controllers/admin/repos.py:549
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:550
+#: rhodecode/controllers/admin/repos.py:551
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:557
+#: rhodecode/controllers/admin/repos.py:558
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:575
+#: rhodecode/controllers/admin/repos.py:576
 msgid "Locked repository"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:578
+#: rhodecode/controllers/admin/repos.py:579
 msgid "Unlocked repository"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:581
-#: rhodecode/controllers/admin/repos.py:610
+#: rhodecode/controllers/admin/repos.py:582
+#: rhodecode/controllers/admin/repos.py:611
 msgid "An error occurred during unlocking"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:600
+#: rhodecode/controllers/admin/repos.py:601
 msgid "Unlocked"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:604
+#: rhodecode/controllers/admin/repos.py:605
 msgid "Locked"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:606
+#: rhodecode/controllers/admin/repos.py:607
 #, python-format
 msgid "Repository has been %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:621
+#: rhodecode/controllers/admin/repos.py:622
 msgid "Cache invalidation successful"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:625
+#: rhodecode/controllers/admin/repos.py:626
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:645
+#: rhodecode/controllers/admin/repos.py:646
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:648
+#: rhodecode/controllers/admin/repos.py:649
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:670
+#: rhodecode/controllers/admin/repos.py:671
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:717
+#: rhodecode/controllers/admin/repos.py:718
 msgid "Error occurred during deleting issue tracker entry"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:720
+#: rhodecode/controllers/admin/repos.py:721
 #: rhodecode/controllers/admin/settings.py:363
 msgid "Removed issue tracker entry"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:750
+#: rhodecode/controllers/admin/repos.py:751
 #: rhodecode/controllers/admin/settings.py:409
 msgid "Updated issue tracker entries"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:809
+#: rhodecode/controllers/admin/repos.py:812
 #: rhodecode/controllers/admin/settings.py:142
 #: rhodecode/controllers/admin/settings.py:719
 msgid "Some form inputs contain invalid data."
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:827
+#: rhodecode/controllers/admin/repos.py:830
 msgid "Error occurred during updating repository VCS settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:831
+#: rhodecode/controllers/admin/repos.py:834
 #: rhodecode/controllers/admin/settings.py:168
 msgid "Updated VCS settings"
 msgstr ""
@@ -1091,26 +1111,18 b' msgid "Updated Labs settings"'
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:795
-msgid "Mercurial server-side merge"
+msgid "Subversion HTTP Support"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:796
-msgid "Use rebase instead of creating a merge commit when merging via web interface"
+msgid "Proxy subversion HTTP requests"
 msgstr ""
 
 #: rhodecode/controllers/admin/settings.py:802
-msgid "Subversion HTTP Support"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:803
-msgid "Proxy subversion HTTP requests"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:809
 msgid "Subversion HTTP Server URL"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:811
+#: rhodecode/controllers/admin/settings.py:804
 msgid "e.g. http://localhost:8080/"
 msgstr ""
 
@@ -1155,121 +1167,281 b' msgid "User Group global permissions upd'
 msgstr ""
 
 #: rhodecode/controllers/admin/user_groups.py:440
-#: rhodecode/controllers/admin/users.py:566
+#: rhodecode/controllers/admin/users.py:561
 msgid "An error occurred during permissions saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:147
+#: rhodecode/controllers/admin/users.py:142
 #, python-format
 msgid "Created user %(user_link)s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:162
+#: rhodecode/controllers/admin/users.py:157
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:206
+#: rhodecode/controllers/admin/users.py:201
 msgid "User updated successfully"
 msgstr ""
 
+#: rhodecode/controllers/admin/users.py:252
+#, python-format
+msgid "Detached %s repositories"
+msgstr ""
+
 #: rhodecode/controllers/admin/users.py:257
 #, python-format
-msgid "Detached %s repositories"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:262
-#, python-format
 msgid "Deleted %s repositories"
 msgstr ""
 
+#: rhodecode/controllers/admin/users.py:265
+#, python-format
+msgid "Detached %s repository groups"
+msgstr ""
+
 #: rhodecode/controllers/admin/users.py:270
 #, python-format
-msgid "Detached %s repository groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:275
-#, python-format
 msgid "Deleted %s repository groups"
 msgstr ""
 
+#: rhodecode/controllers/admin/users.py:278
+#, python-format
+msgid "Detached %s user groups"
+msgstr ""
+
 #: rhodecode/controllers/admin/users.py:283
 #, python-format
-msgid "Detached %s user groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:288
-#, python-format
 msgid "Deleted %s user groups"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:299
+#: rhodecode/controllers/admin/users.py:294
 msgid "Successfully deleted user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:305
+#: rhodecode/controllers/admin/users.py:300
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:324
+#: rhodecode/controllers/admin/users.py:319
 msgid "Force password change disabled for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:326
+#: rhodecode/controllers/admin/users.py:321
 msgid "Force password change enabled for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:330
+#: rhodecode/controllers/admin/users.py:325
 msgid "An error occurred during password reset for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:356
+#: rhodecode/controllers/admin/users.py:351
 #, python-format
 msgid "Created repository group `%s`"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:360
+#: rhodecode/controllers/admin/users.py:355
 msgid "An error occurred during repository group creation for user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:379
-#: rhodecode/controllers/admin/users.py:400
-#: rhodecode/controllers/admin/users.py:430
-#: rhodecode/controllers/admin/users.py:461
-#: rhodecode/controllers/admin/users.py:478
-#: rhodecode/controllers/admin/users.py:501
-#: rhodecode/controllers/admin/users.py:575
-#: rhodecode/controllers/admin/users.py:588
-#: rhodecode/controllers/admin/users.py:646
+#: rhodecode/controllers/admin/users.py:374
+#: rhodecode/controllers/admin/users.py:395
+#: rhodecode/controllers/admin/users.py:425
+#: rhodecode/controllers/admin/users.py:456
+#: rhodecode/controllers/admin/users.py:473
+#: rhodecode/controllers/admin/users.py:496
+#: rhodecode/controllers/admin/users.py:570
+#: rhodecode/controllers/admin/users.py:583
+#: rhodecode/controllers/admin/users.py:641
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:414
+#: rhodecode/controllers/admin/users.py:409
 msgid "The user participates as reviewer in pull requests and cannot be deleted. You can set the user to \"inactive\" instead of deleting it."
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:550
+#: rhodecode/controllers/admin/users.py:545
 msgid "User global permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:678
+#: rhodecode/controllers/admin/users.py:673
 #, python-format
 msgid "An error occurred during ip saving:%s"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:693
+#: rhodecode/controllers/admin/users.py:688
 msgid "An error occurred during ip saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:697
+#: rhodecode/controllers/admin/users.py:692
 #, python-format
 msgid "Added ips %s to user whitelist"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:715
+#: rhodecode/controllers/admin/users.py:710
 msgid "Removed ip address from user whitelist"
 msgstr ""
 
+#: rhodecode/events/pullrequest.py:65
+msgid "pullrequest created"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:74
+msgid "pullrequest closed"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:83
+msgid "pullrequest commits updated"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:92
+msgid "pullrequest review changed"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:101
+msgid "pullrequest merged"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:110
+msgid "pullrequest commented"
+msgstr ""
+
+#: rhodecode/events/repo.py:135
+msgid "repository pre create"
+msgstr ""
+
+#: rhodecode/events/repo.py:144
+msgid "repository created"
+msgstr ""
+
+#: rhodecode/events/repo.py:153
+msgid "repository pre delete"
+msgstr ""
+
+#: rhodecode/events/repo.py:162
+msgid "repository deleted"
+msgstr ""
+
+#: rhodecode/events/repo.py:193
+msgid "repository pre pull"
+msgstr ""
+
+#: rhodecode/events/repo.py:202
+msgid "repository pull"
+msgstr ""
+
+#: rhodecode/events/repo.py:211
+msgid "repository pre push"
+msgstr ""
+
+#: rhodecode/events/repo.py:222
+msgid "repository push"
+msgstr ""
+
+#: rhodecode/events/user.py:34
+msgid "user registered"
+msgstr ""
+
+#: rhodecode/events/user.py:48
+msgid "user pre create"
+msgstr ""
+
+#: rhodecode/events/user.py:61
+msgid "user pre update"
+msgstr ""
+
+#: rhodecode/integrations/schema.py:35
+msgid "Enable or disable this integration."
+msgstr ""
+
+#: rhodecode/integrations/schema.py:42
+msgid "Short name for this integration."
+msgstr ""
+
+#: rhodecode/integrations/schema.py:44
+msgid "Integration name"
+msgstr ""
+
+#: rhodecode/integrations/views.py:172
+msgid "Integration {integration_name} deleted successfully."
+msgstr ""
+
+#: rhodecode/integrations/views.py:200
+msgid "Errors exist when saving integration settings. Please check the form inputs."
+msgstr ""
+
+#: rhodecode/integrations/views.py:220
+msgid "Integration {integration_name} updated successfully."
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:45
+msgid "Slack service URL"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:46
+msgid "This can be setup at the <a href=\"https://my.slack.com/services/new/incoming-webhook/\">slack app manager</a>"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:59 rhodecode/templates/login.html:43
+#: rhodecode/templates/register.html:41
+#: rhodecode/templates/admin/admin_log.html:7
+#: rhodecode/templates/admin/my_account/my_account_profile.html:24
+#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:21
+#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:66
+#: rhodecode/templates/admin/users/user_add.html:35
+#: rhodecode/templates/admin/users/user_edit_profile.html:39
+#: rhodecode/templates/admin/users/users.html:88
+#: rhodecode/templates/base/base.html:306
+#: rhodecode/templates/debug_style/login.html:36
+#: rhodecode/templates/email_templates/user_registration.mako:23
+#: rhodecode/templates/users/user_profile.html:27
+msgid "Username"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:60
+msgid "Username to show notifications coming from."
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:69
+msgid "Channel"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:70
+msgid "Channel to send notifications to."
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:79
+msgid "Emoji"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:80
+msgid "Emoji to use eg. :studio_microphone:"
+msgstr ""
+
+#: rhodecode/integrations/types/slack.py:107
+msgid "Slack"
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:41
+msgid "Webhook URL"
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:42
+msgid "URL of the webhook to receive POST event."
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:51
+msgid "Secret Token"
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:52
+msgid "String used to validate received payloads."
+msgstr ""
+
+#: rhodecode/integrations/types/webhook.py:62
+msgid "Webhook"
+msgstr ""
+
 #: rhodecode/lib/action_parser.py:89
 msgid "[deleted] repository"
 msgstr ""
@@ -1411,11 +1583,15 b' msgstr ""'
 msgid "You need to be signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/base.py:511
+#: rhodecode/lib/base.py:545
 #, python-format
 msgid "The repository at %(repo_name)s cannot be located."
 msgstr ""
 
+#: rhodecode/lib/diffs.py:56
+msgid "Click to comment"
+msgstr ""
+
 #: rhodecode/lib/diffs.py:71
 msgid "Binary file"
 msgstr ""
@@ -1428,36 +1604,40 b' msgstr ""'
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1434
+#: rhodecode/lib/diffs.py:631
+msgid "Click to select line"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:1481
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1438
+#: rhodecode/lib/helpers.py:1485
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1511
+#: rhodecode/lib/helpers.py:1558
 msgid "new file"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1514
+#: rhodecode/lib/helpers.py:1561
 msgid "mod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1517
+#: rhodecode/lib/helpers.py:1564
 msgid "del"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1520
+#: rhodecode/lib/helpers.py:1567
 msgid "rename"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1525
+#: rhodecode/lib/helpers.py:1572
 msgid "chmod"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1767
+#: rhodecode/lib/helpers.py:1819
 msgid ""
 "Example filter terms:\n"
 "     repository:vcs\n"
@@ -1476,89 +1656,91 b' msgid ""'
 "     \"username:test AND repository:test*\"\n"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1787
+#: rhodecode/lib/helpers.py:1839
 #, python-format
 msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:453
+#: rhodecode/lib/utils2.py:454
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:454
+#: rhodecode/lib/utils2.py:455
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:455
+#: rhodecode/lib/utils2.py:456
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:456
+#: rhodecode/lib/utils2.py:457
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:457
+#: rhodecode/lib/utils2.py:458
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:458
+#: rhodecode/lib/utils2.py:459
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:476
+#: rhodecode/lib/utils2.py:477
 #, python-format
 msgid "in %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:482
+#: rhodecode/lib/utils2.py:483
 #, python-format
 msgid "%s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:492
+#: rhodecode/lib/utils2.py:493
 #, python-format
 msgid "%s, %s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:494
+#: rhodecode/lib/utils2.py:495
 #, python-format
 msgid "in %s, %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:496
+#: rhodecode/lib/utils2.py:497
 #, python-format
 msgid "%s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:498
+#: rhodecode/lib/utils2.py:499
 #, python-format
 msgid "%s and %s ago"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:500
+#: rhodecode/lib/utils2.py:501
 #, python-format
 msgid "in %s and %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:504
+#: rhodecode/lib/utils2.py:505 rhodecode/public/js/scripts.js:25035
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
 msgid "just now"
 msgstr ""
 
@@ -1584,7 +1766,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 rhodecode/model/db.py:2291
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 rhodecode/model/db.py:2285
 msgid "Repository no access"
 msgstr ""
 
@@ -1610,7 +1793,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 rhodecode/model/db.py:2292
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 rhodecode/model/db.py:2286
 msgid "Repository read access"
 msgstr ""
 
@@ -1636,7 +1820,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 rhodecode/model/db.py:2293
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 rhodecode/model/db.py:2287
 msgid "Repository write access"
 msgstr ""
 
@@ -1662,7 +1847,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974 rhodecode/model/db.py:2294
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 rhodecode/model/db.py:2288
 msgid "Repository admin access"
 msgstr ""
 
@@ -1728,7 +1914,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 rhodecode/model/db.py:2312
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 rhodecode/model/db.py:2306
 msgid "Repository creation disabled"
 msgstr ""
 
@@ -1754,7 +1941,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 rhodecode/model/db.py:2313
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 rhodecode/model/db.py:2307
 msgid "Repository creation enabled"
 msgstr ""
 
@@ -1780,7 +1968,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 rhodecode/model/db.py:2317
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 rhodecode/model/db.py:2311
 msgid "Repository forking disabled"
 msgstr ""
 
@@ -1806,7 +1995,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998 rhodecode/model/db.py:2318
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 rhodecode/model/db.py:2312
 msgid "Repository forking enabled"
 msgstr ""
 
@@ -1853,7 +2043,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 rhodecode/model/db.py:2950
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 rhodecode/model/db.py:2944
 msgid "Not Reviewed"
 msgstr ""
 
@@ -1879,7 +2070,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 rhodecode/model/db.py:2951
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 rhodecode/model/db.py:2945
 msgid "Approved"
 msgstr ""
 
@@ -1905,7 +2097,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1188
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 rhodecode/model/db.py:2952
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 rhodecode/model/db.py:2946
 msgid "Rejected"
 msgstr ""
 
@@ -1931,7 +2124,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1189
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1321
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346 rhodecode/model/db.py:2953
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1346
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 rhodecode/model/db.py:2947
 msgid "Under Review"
 msgstr ""
 
@@ -1954,7 +2148,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 rhodecode/model/db.py:2296
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 rhodecode/model/db.py:2290
 msgid "Repository group no access"
 msgstr ""
 
@@ -1977,7 +2172,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 rhodecode/model/db.py:2297
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 rhodecode/model/db.py:2291
 msgid "Repository group read access"
 msgstr ""
 
@@ -2000,7 +2196,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 rhodecode/model/db.py:2298
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 rhodecode/model/db.py:2292
 msgid "Repository group write access"
 msgstr ""
 
@@ -2023,7 +2220,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979 rhodecode/model/db.py:2299
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 rhodecode/model/db.py:2293
 msgid "Repository group admin access"
 msgstr ""
 
@@ -2045,7 +2243,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 rhodecode/model/db.py:2301
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 rhodecode/model/db.py:2295
 msgid "User group no access"
 msgstr ""
 
@@ -2067,7 +2266,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 rhodecode/model/db.py:2302
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 rhodecode/model/db.py:2296
 msgid "User group read access"
 msgstr ""
 
@@ -2089,7 +2289,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 rhodecode/model/db.py:2303
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 rhodecode/model/db.py:2297
 msgid "User group write access"
 msgstr ""
 
@@ -2111,7 +2312,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984 rhodecode/model/db.py:2304
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 rhodecode/model/db.py:2298
 msgid "User group admin access"
 msgstr ""
 
@@ -2133,7 +2335,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 rhodecode/model/db.py:2306
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 rhodecode/model/db.py:2300
 msgid "Repository Group creation disabled"
 msgstr ""
 
@@ -2155,7 +2358,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987 rhodecode/model/db.py:2307
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 rhodecode/model/db.py:2301
 msgid "Repository Group creation enabled"
 msgstr ""
 
@@ -2177,7 +2381,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 rhodecode/model/db.py:2309
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 rhodecode/model/db.py:2303
 msgid "User Group creation disabled"
 msgstr ""
 
@@ -2199,7 +2404,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990 rhodecode/model/db.py:2310
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 rhodecode/model/db.py:2304
 msgid "User Group creation enabled"
 msgstr ""
 
@@ -2221,7 +2427,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 rhodecode/model/db.py:2320
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 rhodecode/model/db.py:2314
 msgid "Registration disabled"
 msgstr ""
 
@@ -2243,7 +2450,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 rhodecode/model/db.py:2321
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 rhodecode/model/db.py:2315
 msgid "User Registration with manual account activation"
 msgstr ""
 
@@ -2265,7 +2473,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002 rhodecode/model/db.py:2322
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 rhodecode/model/db.py:2316
 msgid "User Registration with automatic account activation"
 msgstr ""
 
@@ -2287,7 +2496,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 rhodecode/model/db.py:2324
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 rhodecode/model/db.py:2318
 msgid "Manual activation of external account"
 msgstr ""
 
@@ -2309,7 +2519,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005 rhodecode/model/db.py:2325
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 rhodecode/model/db.py:2319
 msgid "Automatic activation of external account"
 msgstr ""
 
@@ -2325,7 +2536,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 rhodecode/model/db.py:2314
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 rhodecode/model/db.py:2308
 msgid "Repository creation enabled with write permission to a repository group"
 msgstr ""
 
@@ -2341,7 +2553,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995 rhodecode/model/db.py:2315
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 rhodecode/model/db.py:2309
 msgid "Repository creation disabled with write permission to a repository group"
 msgstr ""
 
@@ -2354,7 +2567,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969 rhodecode/model/db.py:2289
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 rhodecode/model/db.py:2283
 msgid "RhodeCode Super Administrator"
 msgstr ""
 
@@ -2365,7 +2579,8 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:854
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 rhodecode/model/db.py:2327
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 rhodecode/model/db.py:2321
 msgid "Inherit object permissions from default user disabled"
 msgstr ""
 
@@ -2376,10 +2591,35 b' msgstr ""'
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:855
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:861
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:983
-#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008 rhodecode/model/db.py:2328
+#: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1008
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 rhodecode/model/db.py:2322
 msgid "Inherit object permissions from default user enabled"
 msgstr ""
 
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 rhodecode/model/db.py:910
+msgid "all"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 rhodecode/model/db.py:911
+msgid "http/web interface"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 rhodecode/model/db.py:912
+msgid "vcs (git/hg/svn protocol)"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 rhodecode/model/db.py:913
+msgid "api calls"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 rhodecode/model/db.py:914
+msgid "feed access"
+msgstr ""
+
+#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 rhodecode/model/db.py:2061
+msgid "No parent"
+msgstr ""
+
 #: rhodecode/lib/index/whoosh.py:148
 msgid "Invalid search query. Try quoting it."
 msgstr ""
@@ -2424,48 +2664,32 b' msgstr ""'
 msgid "Your password reset link was sent"
 msgstr ""
 
-#: rhodecode/login/views.py:333
+#: rhodecode/login/views.py:336
 msgid "Your password reset was successful, a new password has been sent to your email"
 msgstr ""
 
-#: rhodecode/model/db.py:909
-msgid "all"
-msgstr ""
-
-#: rhodecode/model/db.py:910
-msgid "http/web interface"
-msgstr ""
-
-#: rhodecode/model/db.py:911
-msgid "vcs (git/hg protocol)"
-msgstr ""
-
-#: rhodecode/model/db.py:912
-msgid "api calls"
-msgstr ""
-
-#: rhodecode/model/db.py:913
-msgid "feed access"
-msgstr ""
-
-#: rhodecode/model/db.py:2067
-msgid "No parent"
-msgstr ""
-
-#: rhodecode/model/forms.py:66
+#: rhodecode/model/comment.py:263
+msgid "made a comment"
+msgstr ""
+
+#: rhodecode/model/comment.py:264
+msgid "Refresh page"
+msgstr ""
+
+#: rhodecode/model/forms.py:85
 msgid "Please enter a login"
 msgstr ""
 
-#: rhodecode/model/forms.py:67
+#: rhodecode/model/forms.py:86
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
-#: rhodecode/model/forms.py:76
+#: rhodecode/model/forms.py:95
 msgid "Please enter a password"
 msgstr ""
 
-#: rhodecode/model/forms.py:77
+#: rhodecode/model/forms.py:96
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
@@ -2574,43 +2798,43 b' msgid ""'
 " %(pr_title)s"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:448
+#: rhodecode/model/pull_request.py:449
 msgid "Pull request merged and closed"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:867
+#: rhodecode/model/pull_request.py:874
 msgid "Server-side pull request merging is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:869
+#: rhodecode/model/pull_request.py:876
 msgid "This pull request is closed."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:880
+#: rhodecode/model/pull_request.py:887
 msgid "Pull request merging is not supported."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:898
+#: rhodecode/model/pull_request.py:905
 msgid "Target repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:901
+#: rhodecode/model/pull_request.py:908
 msgid "Source repository large files support is disabled."
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1050 rhodecode/model/scm.py:791
+#: rhodecode/model/pull_request.py:1058 rhodecode/model/scm.py:788
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1055
+#: rhodecode/model/pull_request.py:1063
 msgid "Commit IDs"
 msgstr ""
 
-#: rhodecode/model/pull_request.py:1058
+#: rhodecode/model/pull_request.py:1066
 msgid "Closed Branches"
 msgstr ""
 
-#: rhodecode/model/scm.py:773
+#: rhodecode/model/scm.py:770
 msgid "latest tip"
 msgstr ""
 
@@ -2811,6 +3035,7 b' msgid "Revisions %(revs)s are already pa'
 msgstr ""
 
 #: rhodecode/model/validators.py:933
+#: rhodecode/model/validation_schema/validators.py:14
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
@@ -2824,31 +3049,389 b' msgid "Key name can only consist of lett'
 msgstr ""
 
 #: rhodecode/model/validators.py:976
-msgid "Filename cannot be inside a directory"
-msgstr ""
-
-#: rhodecode/model/validators.py:992
 #, python-format
 msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
 msgstr ""
 
-#: rhodecode/model/validators.py:995
+#: rhodecode/model/validators.py:979
 #, python-format
 msgid "The plugin \"%(plugin_id)s\" is missing an includeme function."
 msgstr ""
 
-#: rhodecode/model/validators.py:998
+#: rhodecode/model/validators.py:982
 #, python-format
 msgid "Can not load plugin \"%(plugin_id)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:1000
+#: rhodecode/model/validators.py:984
 #, python-format
 msgid "No plugin available with ID \"%(plugin_id)s\""
 msgstr ""
 
-#: rhodecode/model/validators.py:1067
-msgid "This gistid is already in use"
+#: rhodecode/model/validation_schema/schemas/gist_schema.py:89
+msgid "Gist with name {} already exists"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/gist_schema.py:95
+msgid "Filename {} cannot be inside a directory"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/gist_schema.py:132
+msgid "Duplicated value for filename found: `{}`"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:23039
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
+#: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87
+msgid "No results"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:24970
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109
+msgid "{0} year"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:24971
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110
+msgid "{0} month"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:24972
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111
+msgid "{0} day"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:24973
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112
+msgid "{0} hour"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:24974
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113
+msgid "{0} min"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:24975
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114
+msgid "{0} sec"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:24995
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134
+msgid "in {0}"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:25003
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142
+msgid "{0} ago"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:25015
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154
+msgid "{0}, {1} ago"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:25017
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156
+msgid "in {0}, {1}"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:25021
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160
+msgid "{0} and {1}"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:25023
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162
+msgid "{0} and {1} ago"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:25025
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
+#: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164
+msgid "in {0} and {1}"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39304
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
+#: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4
+msgid "Loading more results..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39307
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27
+#: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7
+msgid "Searching..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39310
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
+#: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10
+msgid "No matches found"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39313
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
+#: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13
+msgid "Loading failed"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39317
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20
+#: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17
+msgid "One result is available, press enter to select it."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39319
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64
+#: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19
+msgid "{0} results are available, use up and down arrow keys to navigate."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39324
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
+#: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24
+msgid "Please enter {0} or more character"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39326
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
+#: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26
+msgid "Please enter {0} or more characters"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39331
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
+#: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31
+msgid "Please delete {0} character"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39333
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
+#: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33
+msgid "Please delete {0} characters"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39337
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40
+#: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37
+msgid "You can only select {0} item"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39339
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41
+#: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39
+msgid "You can only select {0} items"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:40911
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
+#: rhodecode/public/js/src/rhodecode/codemirror.js:369
+msgid "Set status to Approved"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:40929
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30
+#: rhodecode/public/js/src/rhodecode/codemirror.js:387
+msgid "Set status to Rejected"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41308
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:2
+#: rhodecode/public/js/src/rhodecode/comments.js:235
+msgid "Add another comment"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41526
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
+#: rhodecode/public/js/src/rhodecode/comments.js:453
+msgid "Status Review"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41540
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:3
+#: rhodecode/public/js/src/rhodecode/comments.js:467
+msgid "Comment text will be set automatically based on currently selected status ({0}) ..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41653
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37
+#: rhodecode/public/js/src/rhodecode/comments.js:580
+msgid "Submitting..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41703
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
+#: rhodecode/public/js/src/rhodecode/comments.js:630
+#: rhodecode/templates/files/files_browser_tree.html:47
+msgid "Loading ..."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41903
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
+#: rhodecode/public/js/src/rhodecode/files.js:150
+msgid "truncated result"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41905
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
+#: rhodecode/public/js/src/rhodecode/files.js:152
+msgid "truncated results"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:41914
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
+#: rhodecode/public/js/src/rhodecode/files.js:161
+msgid "No matching files"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:42049
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
+#: rhodecode/public/js/src/rhodecode/files.js:296
+msgid "Selection link"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:42089
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36
+#: rhodecode/public/js/src/rhodecode/followers.js:26
+msgid "Stop following this repository"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:42090
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
+#: rhodecode/public/js/src/rhodecode/followers.js:27
+msgid "Unfollow"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:42099
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
+#: rhodecode/public/js/src/rhodecode/followers.js:36
+msgid "Start following this repository"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:42100
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
+#: rhodecode/public/js/src/rhodecode/followers.js:37
+msgid "Follow"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:43049
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
+#: rhodecode/public/js/src/rhodecode.js:142
+msgid "file"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:43069
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31
+#: rhodecode/public/js/src/rhodecode.js:162
+msgid "Show more"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
+msgid "No bookmarks available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
+msgid "No branches available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
+msgid "No gists available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
+msgid "No pull requests available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14
+msgid "No repositories available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
+msgid "No repository groups available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
+msgid "No tags available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
+msgid "No user groups available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
+msgid "No users available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
+#: rhodecode/templates/changelog/changelog.html:62
+msgid "Open new pull request"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
+msgid "Open new pull request for selected commit"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32
+msgid "Show selected commit __S"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33
+msgid "Show selected commits __S ... __E"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
+msgid "Updating..."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42
+#: rhodecode/templates/admin/auth/auth_settings.html:71
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43
+#: rhodecode/templates/admin/auth/auth_settings.html:71
+msgid "enabled"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
+msgid "files"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
+msgid "specify commit"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
+msgid "{0} active out of {1} users"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
+msgid "{0} days"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
+msgid "{0} hours"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
+msgid "{0} months"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
+msgid "{0} years"
 msgstr ""
 
 #: rhodecode/templates/index.html:5
@@ -2909,7 +3492,7 b' msgstr ""'
 #: rhodecode/templates/base/perms_summary.html:102
 #: rhodecode/templates/bookmarks/bookmarks.html:59
 #: rhodecode/templates/branches/branches.html:58
-#: rhodecode/templates/files/files_browser.html:49
+#: rhodecode/templates/files/files_browser_tree.html:5
 #: rhodecode/templates/pullrequests/pullrequests.html:100
 #: rhodecode/templates/tags/tags.html:59
 msgid "Name"
@@ -2918,6 +3501,7 b' msgstr ""'
 #: rhodecode/templates/index_base.html:100
 #: rhodecode/templates/index_base.html:125
 #: rhodecode/templates/admin/gists/index.html:114
+#: rhodecode/templates/admin/integrations/list.html:63
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:77
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:45
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:42
@@ -2933,8 +3517,9 b' msgstr ""'
 #: rhodecode/templates/base/issue_tracker_settings.html:10
 #: rhodecode/templates/changeset/changeset.html:53
 #: rhodecode/templates/compare/compare_commits.html:24
+#: rhodecode/templates/email_templates/commit_comment.mako:82
 #: rhodecode/templates/email_templates/pull_request_review.mako:30
-#: rhodecode/templates/email_templates/pull_request_review.mako:67
+#: rhodecode/templates/email_templates/pull_request_review.mako:51
 #: rhodecode/templates/files/file_tree_detail.html:5
 #: rhodecode/templates/files/file_tree_detail.html:12
 #: rhodecode/templates/forks/fork.html:48
@@ -2972,12 +3557,12 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:63
 #: rhodecode/templates/bookmarks/bookmarks.html:66
 #: rhodecode/templates/branches/branches.html:65
-#: rhodecode/templates/changelog/changelog.html:106
-#: rhodecode/templates/changelog/changelog_summary_data.html:6
+#: rhodecode/templates/changelog/changelog.html:104
+#: rhodecode/templates/changelog/changelog_summary_data.html:8
 #: rhodecode/templates/changeset/changeset.html:36
 #: rhodecode/templates/compare/compare_commits.html:22
-#: rhodecode/templates/email_templates/commit_comment.mako:16
 #: rhodecode/templates/email_templates/commit_comment.mako:45
+#: rhodecode/templates/email_templates/commit_comment.mako:81
 #: rhodecode/templates/search/search_commit.html:6
 #: rhodecode/templates/tags/tags.html:66
 msgid "Commit"
@@ -2993,7 +3578,7 b' msgid "Home"'
 msgstr ""
 
 #: rhodecode/templates/login.html:5 rhodecode/templates/login.html:35
-#: rhodecode/templates/login.html:64 rhodecode/templates/base/base.html:328
+#: rhodecode/templates/login.html:64 rhodecode/templates/base/base.html:329
 #: rhodecode/templates/debug_style/login.html:60
 msgid "Sign In"
 msgstr ""
@@ -3002,20 +3587,6 b' msgstr ""'
 msgid "Go to the registration page to create a new account."
 msgstr ""
 
-#: rhodecode/templates/login.html:43 rhodecode/templates/register.html:41
-#: rhodecode/templates/admin/admin_log.html:5
-#: rhodecode/templates/admin/my_account/my_account_profile.html:24
-#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:21
-#: rhodecode/templates/admin/my_account/my_account_profile_edit.html:66
-#: rhodecode/templates/admin/users/user_add.html:35
-#: rhodecode/templates/admin/users/user_edit_profile.html:39
-#: rhodecode/templates/admin/users/users.html:89
-#: rhodecode/templates/base/base.html:305
-#: rhodecode/templates/debug_style/login.html:36
-#: rhodecode/templates/users/user_profile.html:27
-msgid "Username"
-msgstr ""
-
 #: rhodecode/templates/login.html:58
 msgid "Remember me"
 msgstr ""
@@ -3051,7 +3622,7 b' msgid "Send password reset email"'
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:60
-msgid "Password reset link will be send to matching email address"
+msgid "Password reset link will be sent to matching email address"
 msgstr ""
 
 #: rhodecode/templates/register.html:35
@@ -3072,7 +3643,7 b' msgstr ""'
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:76
 #: rhodecode/templates/admin/users/user_add.html:68
 #: rhodecode/templates/admin/users/user_edit_profile.html:47
-#: rhodecode/templates/admin/users/users.html:93
+#: rhodecode/templates/admin/users/users.html:92
 msgid "First Name"
 msgstr ""
 
@@ -3082,7 +3653,7 b' msgstr ""'
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:85
 #: rhodecode/templates/admin/users/user_add.html:77
 #: rhodecode/templates/admin/users/user_edit_profile.html:56
-#: rhodecode/templates/admin/users/users.html:95
+#: rhodecode/templates/admin/users/users.html:94
 msgid "Last Name"
 msgstr ""
 
@@ -3096,7 +3667,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:15
-#: rhodecode/templates/base/base.html:78
+#: rhodecode/templates/base/base.html:77
 msgid "Admin journal"
 msgstr ""
 
@@ -3121,17 +3692,17 b' msgstr[1] ""'
 msgid "Example Queries"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:6
+#: rhodecode/templates/admin/admin_log.html:8
 #: rhodecode/templates/admin/my_account/my_account_repos.html:37
 #: rhodecode/templates/admin/repo_groups/repo_groups.html:62
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:13
 #: rhodecode/templates/admin/repos/repos.html:69
 #: rhodecode/templates/admin/user_groups/user_groups.html:66
-#: rhodecode/templates/admin/users/users.html:106
+#: rhodecode/templates/admin/users/users.html:105
 msgid "Action"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:7
+#: rhodecode/templates/admin/admin_log.html:9
 #: rhodecode/templates/admin/defaults/defaults.html:31
 #: rhodecode/templates/admin/permissions/permissions_objects.html:13
 #: rhodecode/templates/search/search_commit.html:5
@@ -3139,18 +3710,18 b' msgstr ""'
 msgid "Repository"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:8
+#: rhodecode/templates/admin/admin_log.html:10
 #: rhodecode/templates/bookmarks/bookmarks.html:61
 #: rhodecode/templates/branches/branches.html:60
 #: rhodecode/templates/tags/tags.html:61
 msgid "Date"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:9
+#: rhodecode/templates/admin/admin_log.html:11
 msgid "From IP"
 msgstr ""
 
-#: rhodecode/templates/admin/admin_log.html:44
+#: rhodecode/templates/admin/admin_log.html:46
 msgid "No actions yet"
 msgstr ""
 
@@ -3162,6 +3733,9 b' msgstr ""'
 #: rhodecode/templates/admin/auth/auth_settings.html:12
 #: rhodecode/templates/admin/auth/plugin_settings.html:12
 #: rhodecode/templates/admin/defaults/defaults.html:12
+#: rhodecode/templates/admin/integrations/base.html:19
+#: rhodecode/templates/admin/integrations/edit.html:15
+#: rhodecode/templates/admin/integrations/list.html:8
 #: rhodecode/templates/admin/permissions/permissions.html:12
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:12
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12
@@ -3179,9 +3753,9 b' msgstr ""'
 #: rhodecode/templates/admin/users/user_add.html:11
 #: rhodecode/templates/admin/users/user_edit.html:12
 #: rhodecode/templates/admin/users/users.html:13
-#: rhodecode/templates/admin/users/users.html:102
-#: rhodecode/templates/base/base.html:405
-#: rhodecode/templates/base/base.html:412
+#: rhodecode/templates/admin/users/users.html:101
+#: rhodecode/templates/base/base.html:406
+#: rhodecode/templates/base/base.html:413
 msgid "Admin"
 msgstr ""
 
@@ -3206,14 +3780,6 b' msgstr ""'
 msgid "Available Built-in Plugins"
 msgstr ""
 
-#: rhodecode/templates/admin/auth/auth_settings.html:71
-msgid "enabled"
-msgstr ""
-
-#: rhodecode/templates/admin/auth/auth_settings.html:71
-msgid "disabled"
-msgstr ""
-
 #: rhodecode/templates/admin/auth/auth_settings.html:81
 #: rhodecode/templates/admin/auth/plugin_settings.html:87
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:63
@@ -3254,6 +3820,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.html:14
 #: rhodecode/templates/admin/gists/index.html:110
+#: rhodecode/templates/admin/integrations/list.html:64
 #: rhodecode/templates/admin/repos/repo_add_base.html:62
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:12
 msgid "Type"
@@ -3320,18 +3887,18 b' msgstr ""'
 msgid "Gist access level"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:59
+#: rhodecode/templates/admin/gists/edit.html:62
 #: rhodecode/templates/admin/gists/new.html:50
 #: rhodecode/templates/files/files_add.html:74
 #: rhodecode/templates/files/files_edit.html:78
 msgid "plain"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:103
+#: rhodecode/templates/admin/gists/edit.html:107
 msgid "Update Gist"
 msgstr ""
 
-#: rhodecode/templates/admin/gists/edit.html:104
+#: rhodecode/templates/admin/gists/edit.html:108
 #: rhodecode/templates/base/issue_tracker_settings.html:74
 #: rhodecode/templates/changeset/changeset_file_comment.html:139
 #: rhodecode/templates/files/files_add.html:102
@@ -3392,14 +3959,14 b' msgstr ""'
 
 #: rhodecode/templates/admin/gists/index.html:108
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:87
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:89
 #: rhodecode/templates/bookmarks/bookmarks.html:63
 #: rhodecode/templates/branches/branches.html:62
-#: rhodecode/templates/changelog/changelog.html:102
-#: rhodecode/templates/changelog/changelog_summary_data.html:10
+#: rhodecode/templates/changelog/changelog.html:110
+#: rhodecode/templates/changelog/changelog_summary_data.html:11
 #: rhodecode/templates/changeset/changeset.html:164
 #: rhodecode/templates/compare/compare_commits.html:21
-#: rhodecode/templates/files/files_browser.html:53
+#: rhodecode/templates/files/files_browser_tree.html:9
 #: rhodecode/templates/pullrequests/pullrequest_show.html:169
 #: rhodecode/templates/pullrequests/pullrequests.html:102
 #: rhodecode/templates/search/search_commit.html:16
@@ -3482,9 +4049,10 b' msgid "Gist"'
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:49
+#: rhodecode/templates/admin/integrations/list.html:110
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:56
 #: rhodecode/templates/admin/my_account/my_account_emails.html:32
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:61
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:63
 #: rhodecode/templates/admin/permissions/permissions_ips.html:26
 #: rhodecode/templates/admin/repos/repo_edit_fields.html:25
 #: rhodecode/templates/admin/settings/settings_hooks.html:46
@@ -3496,10 +4064,10 b' msgstr ""'
 #: rhodecode/templates/base/vcs_settings.html:172
 #: rhodecode/templates/changeset/changeset_file_comment.html:49
 #: rhodecode/templates/changeset/changeset_file_comment.html:99
-#: rhodecode/templates/data_table/_dt_elements.html:117
-#: rhodecode/templates/data_table/_dt_elements.html:174
-#: rhodecode/templates/data_table/_dt_elements.html:188
-#: rhodecode/templates/data_table/_dt_elements.html:200
+#: rhodecode/templates/data_table/_dt_elements.html:119
+#: rhodecode/templates/data_table/_dt_elements.html:176
+#: rhodecode/templates/data_table/_dt_elements.html:190
+#: rhodecode/templates/data_table/_dt_elements.html:202
 #: rhodecode/templates/debug_style/buttons.html:132
 #: rhodecode/templates/files/files_source.html:33
 #: rhodecode/templates/files/files_source.html:37
@@ -3512,14 +4080,15 b' msgid "Confirm to delete this Gist"'
 msgstr ""
 
 #: rhodecode/templates/admin/gists/show.html:56
+#: rhodecode/templates/admin/integrations/list.html:103
 #: rhodecode/templates/admin/my_account/my_account_profile.html:5
 #: rhodecode/templates/base/issue_tracker_settings.html:61
 #: rhodecode/templates/changeset/changeset_file_comment.html:145
 #: rhodecode/templates/changeset/changeset_file_comment.html:292
-#: rhodecode/templates/data_table/_dt_elements.html:112
-#: rhodecode/templates/data_table/_dt_elements.html:170
-#: rhodecode/templates/data_table/_dt_elements.html:183
-#: rhodecode/templates/data_table/_dt_elements.html:196
+#: rhodecode/templates/data_table/_dt_elements.html:114
+#: rhodecode/templates/data_table/_dt_elements.html:172
+#: rhodecode/templates/data_table/_dt_elements.html:185
+#: rhodecode/templates/data_table/_dt_elements.html:198
 #: rhodecode/templates/debug_style/buttons.html:128
 #: rhodecode/templates/files/files_add.html:204
 #: rhodecode/templates/files/files_edit.html:165
@@ -3549,8 +4118,44 b' msgstr ""'
 msgid "Show as raw"
 msgstr ""
 
+#: rhodecode/templates/admin/integrations/base.html:12
+msgid "Integrations settings"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/edit.html:17
+#: rhodecode/templates/admin/integrations/list.html:10
+#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44
+#: rhodecode/templates/admin/repos/repo_edit.html:15
+#: rhodecode/templates/admin/repos/repo_edit.html:43
+#: rhodecode/templates/admin/settings/settings.html:14
+#: rhodecode/templates/admin/user_groups/user_group_edit.html:33
+#: rhodecode/templates/base/base.html:86 rhodecode/templates/base/base.html:251
+msgid "Settings"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/edit.html:36
+#, python-format
+msgid "Create new %(integration_type)s integration"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:31
+msgid "Create new integration"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:56
+msgid "Current integrations"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:65
+msgid "Actions"
+msgstr ""
+
+#: rhodecode/templates/admin/integrations/list.html:89
+msgid "unknown integration"
+msgstr ""
+
 #: rhodecode/templates/admin/my_account/my_account.html:5
-#: rhodecode/templates/base/base.html:342
+#: rhodecode/templates/base/base.html:343
 msgid "My account"
 msgstr ""
 
@@ -3586,7 +4191,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/my_account/my_account.html:40
 #: rhodecode/templates/admin/notifications/notifications.html:33
-#: rhodecode/templates/base/base.html:242
+#: rhodecode/templates/base/base.html:243
 msgid "Pull Requests"
 msgstr ""
 
@@ -3594,6 +4199,10 b' msgstr ""'
 msgid "My Permissions"
 msgstr ""
 
+#: rhodecode/templates/admin/my_account/my_account.html:42
+msgid "My Live Notifications"
+msgstr ""
+
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:3
 msgid "Authentication Tokens"
 msgstr ""
@@ -3603,7 +4212,7 b' msgid "Built-in tokens can be used to au'
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:8
-msgid "Each token can have a role. VCS tokens can be used together with the authtoken auth plugin for git/hg operations."
+msgid "Each token can have a role. VCS tokens can be used together with the authtoken auth plugin for git/hg/svn operations."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:14
@@ -3680,6 +4289,19 b' msgstr ""'
 msgid "New email address"
 msgstr ""
 
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:3
+msgid "Your live notification settings"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:14
+#: rhodecode/templates/admin/notifications/show_notification.html:12
+msgid "Notifications"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_notifications.html:14
+msgid "Disabled"
+msgstr ""
+
 #: rhodecode/templates/admin/my_account/my_account_password.html:3
 msgid "Change Your Account Password"
 msgstr ""
@@ -3734,35 +4356,35 b' msgid "Pull Requests You Opened"'
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:23
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:86
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:88
 msgid "Target Repo"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:26
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:89
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:91
 #: rhodecode/templates/admin/settings/settings_global.html:9
 #: rhodecode/templates/email_templates/pull_request_review.mako:28
-#: rhodecode/templates/email_templates/pull_request_review.mako:65
+#: rhodecode/templates/email_templates/pull_request_review.mako:48
 #: rhodecode/templates/pullrequests/pullrequest.html:38
 #: rhodecode/templates/pullrequests/pullrequests.html:104
 msgid "Title"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:27
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:90
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:92
 msgid "Opened On"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:41
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:103
-#: rhodecode/templates/changelog/changelog.html:141
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:43
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:107
+#: rhodecode/templates/changelog/changelog.html:153
 #: rhodecode/templates/compare/compare_commits.html:49
 #: rhodecode/templates/search/search_commit.html:36
 msgid "Expand commit message"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:50
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:112
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:52
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:116
 #: rhodecode/templates/changeset/changeset_file_comment.html:284
 #: rhodecode/templates/pullrequests/pullrequest_show.html:14
 #: rhodecode/templates/pullrequests/pullrequest_show.html:112
@@ -3770,19 +4392,19 b' msgstr ""'
 msgid "Closed"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:62
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:64
 msgid "Confirm to delete this pull request"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:69
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:71
 msgid "You currently have no open pull requests."
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:77
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:79
 msgid "Pull Requests You Participate In"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:125
+#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:129
 msgid "There are currently no open pull requests requiring your participation."
 msgstr ""
 
@@ -3822,19 +4444,15 b' msgstr ""'
 msgid "Show notification"
 msgstr ""
 
-#: rhodecode/templates/admin/notifications/show_notification.html:12
-msgid "Notifications"
-msgstr ""
-
 #: rhodecode/templates/admin/permissions/permissions.html:5
 msgid "Permissions Administration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:14
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:45
-#: rhodecode/templates/admin/repos/repo_edit.html:42
+#: rhodecode/templates/admin/repos/repo_edit.html:46
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:34
-#: rhodecode/templates/base/base.html:83
+#: rhodecode/templates/base/base.html:82
 msgid "Permissions"
 msgstr ""
 
@@ -3963,7 +4581,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:14
 #: rhodecode/templates/admin/users/user_edit_advanced.html:12
-#: rhodecode/templates/base/base.html:80 rhodecode/templates/base/base.html:152
+#: rhodecode/templates/base/base.html:79 rhodecode/templates/base/base.html:153
 msgid "Repository groups"
 msgstr ""
 
@@ -3994,17 +4612,8 b' msgstr ""'
 msgid "Add Child Group"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:44
-#: rhodecode/templates/admin/repos/repo_edit.html:15
-#: rhodecode/templates/admin/repos/repo_edit.html:39
-#: rhodecode/templates/admin/settings/settings.html:14
-#: rhodecode/templates/admin/user_groups/user_group_edit.html:33
-#: rhodecode/templates/base/base.html:86 rhodecode/templates/base/base.html:250
-msgid "Settings"
-msgstr ""
-
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:46
-#: rhodecode/templates/admin/repos/repo_edit.html:45
+#: rhodecode/templates/admin/repos/repo_edit.html:49
 #: rhodecode/templates/admin/user_groups/user_group_edit.html:35
 #: rhodecode/templates/admin/users/user_edit.html:35
 msgid "Advanced"
@@ -4177,7 +4786,7 b' msgid "Import Existing Repository ?"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:23
-#: rhodecode/templates/base/base.html:197
+#: rhodecode/templates/base/base.html:198
 msgid "Clone from"
 msgstr ""
 
@@ -4244,19 +4853,19 b' msgstr ""'
 msgid "%s repository settings"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:51
+#: rhodecode/templates/admin/repos/repo_edit.html:55
 msgid "Extra Fields"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:57
-msgid "Caches"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:61
-msgid "Remote"
+msgid "Caches"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:65
+msgid "Remote"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:69
 #: rhodecode/templates/summary/components.html:135
 msgid "Statistics"
 msgstr ""
@@ -4358,7 +4967,7 b' msgid "Delete forks"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:139
-#: rhodecode/templates/data_table/_dt_elements.html:118
+#: rhodecode/templates/data_table/_dt_elements.html:120
 #, python-format
 msgid "Confirm to delete this repository: %s"
 msgstr ""
@@ -4419,7 +5028,7 b' msgstr ""'
 #: rhodecode/templates/admin/user_groups/user_groups.html:62
 #: rhodecode/templates/admin/users/user_add.html:97
 #: rhodecode/templates/admin/users/user_edit_profile.html:90
-#: rhodecode/templates/admin/users/users.html:100
+#: rhodecode/templates/admin/users/users.html:99
 msgid "Active"
 msgstr ""
 
@@ -4575,7 +5184,7 b' msgid "http[s] url where from repository'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.html:56
-#: rhodecode/templates/data_table/_dt_elements.html:158
+#: rhodecode/templates/data_table/_dt_elements.html:160
 #: rhodecode/templates/forks/fork.html:58
 msgid "Repository group"
 msgstr ""
@@ -4823,12 +5432,11 b' msgid "Server Announcement"'
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:80
-msgid "Custom js/css code added at the end of the <header> tag."
+msgid "Custom js/css code added at the end of the <header/> tag."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:81
-#: rhodecode/templates/admin/settings/settings_global.html:103
-msgid "Use <script> or <css> tags to define custom styling or scripting"
+msgid "Use <script/> or <css/> tags to define custom styling or scripting"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.html:88
@@ -4839,6 +5447,10 b' msgstr ""'
 msgid "Custom js/css code added at the end of the <body> tag."
 msgstr ""
 
+#: rhodecode/templates/admin/settings/settings_global.html:103
+msgid "Use <script> or <css> tags to define custom styling or scripting"
+msgstr ""
+
 #: rhodecode/templates/admin/settings/settings_hooks.html:3
 msgid "Built in Mercurial hooks - read only"
 msgstr ""
@@ -5209,7 +5821,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/user_groups/user_group_add.html:13
 #: rhodecode/templates/admin/users/user_edit_advanced.html:13
-#: rhodecode/templates/base/base.html:82 rhodecode/templates/base/base.html:155
+#: rhodecode/templates/base/base.html:81 rhodecode/templates/base/base.html:156
 msgid "User groups"
 msgstr ""
 
@@ -5300,8 +5912,8 b' msgid "Change owner of this user group."'
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:59
-#: rhodecode/templates/base/base.html:257
-#: rhodecode/templates/base/base.html:399
+#: rhodecode/templates/base/base.html:258
+#: rhodecode/templates/base/base.html:400
 #: rhodecode/templates/search/search.html:64
 msgid "Search"
 msgstr ""
@@ -5345,7 +5957,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_add.html:13
 #: rhodecode/templates/admin/users/user_edit.html:14
-#: rhodecode/templates/base/base.html:81
+#: rhodecode/templates/base/base.html:80
 msgid "Users"
 msgstr ""
 
@@ -5408,7 +6020,7 b' msgid "Source of Record"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:8
-#: rhodecode/templates/admin/users/users.html:98
+#: rhodecode/templates/admin/users/users.html:97
 msgid "Last login"
 msgstr ""
 
@@ -5505,7 +6117,7 b' msgid "Detach user groups"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.html:135
-#: rhodecode/templates/data_table/_dt_elements.html:189
+#: rhodecode/templates/data_table/_dt_elements.html:191
 #, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
@@ -5585,21 +6197,21 b' msgstr ""'
 msgid "Users administration"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:104
+#: rhodecode/templates/admin/users/users.html:103
 msgid "Authentication type"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:45
+#: rhodecode/templates/base/base.html:44
 #: rhodecode/templates/errors/error_document.html:51
 msgid "Support"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:52
+#: rhodecode/templates/base/base.html:51
 #, python-format
 msgid "RhodeCode instance id: %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:84
+#: rhodecode/templates/base/base.html:83
 msgid "Authentication"
 msgstr ""
 
@@ -5613,40 +6225,40 b' msgstr ""'
 msgid "Show More"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:189
+#: rhodecode/templates/base/base.html:190
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:206
+#: rhodecode/templates/base/base.html:207
 #, python-format
 msgid "Repository locked by %(user)s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:211
+#: rhodecode/templates/base/base.html:212
 msgid "Repository not locked. Pull repository to lock it."
 msgstr ""
 
-#: rhodecode/templates/base/base.html:229
-#: rhodecode/templates/data_table/_dt_elements.html:12
-#: rhodecode/templates/data_table/_dt_elements.html:13
-#: rhodecode/templates/data_table/_dt_elements.html:147
-msgid "Summary"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:230
+#: rhodecode/templates/data_table/_dt_elements.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:13
+#: rhodecode/templates/data_table/_dt_elements.html:149
+msgid "Summary"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:231
 #: rhodecode/templates/data_table/_dt_elements.html:17
 #: rhodecode/templates/data_table/_dt_elements.html:18
 msgid "Changelog"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:231
+#: rhodecode/templates/base/base.html:232
 #: rhodecode/templates/data_table/_dt_elements.html:22
 #: rhodecode/templates/data_table/_dt_elements.html:23
 #: rhodecode/templates/files/files.html:15
 msgid "Files"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:233
+#: rhodecode/templates/base/base.html:234
 #: rhodecode/templates/bookmarks/bookmarks.html:68
 #: rhodecode/templates/branches/branches.html:67
 #: rhodecode/templates/files/file_diff.html:11
@@ -5655,29 +6267,29 b' msgstr ""'
 msgid "Compare"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:238
+#: rhodecode/templates/base/base.html:239
 #, python-format
 msgid "Show Pull Requests for %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:247
+#: rhodecode/templates/base/base.html:248
 msgid "Options"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:254
+#: rhodecode/templates/base/base.html:255
 #: rhodecode/templates/forks/forks_data.html:30
 msgid "Compare fork"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:261
+#: rhodecode/templates/base/base.html:262
 msgid "Unlock"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:263
+#: rhodecode/templates/base/base.html:264
 msgid "Lock"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:268
+#: rhodecode/templates/base/base.html:269
 #: rhodecode/templates/data_table/_dt_elements.html:27
 #: rhodecode/templates/data_table/_dt_elements.html:28
 #: rhodecode/templates/forks/forks_data.html:8
@@ -5687,73 +6299,73 b' msgid_plural "Forks"'
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/base/base.html:269
+#: rhodecode/templates/base/base.html:270
 msgid "Create Pull Request"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:291
+#: rhodecode/templates/base/base.html:292
 msgid "Sign in"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:300
 #: rhodecode/templates/debug_style/login.html:28
 msgid "Sign in to your account"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:315
+#: rhodecode/templates/base/base.html:316
 #: rhodecode/templates/debug_style/login.html:46
 msgid "(Forgot password?)"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:324
+#: rhodecode/templates/base/base.html:325
 #: rhodecode/templates/debug_style/login.html:56
 msgid "Don't have an account ?"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:345
+#: rhodecode/templates/base/base.html:346
 msgid "Sign Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:381
-msgid "Show activity journal"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:382
+msgid "Show activity journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:383
 #: rhodecode/templates/journal/journal.html:4
 #: rhodecode/templates/journal/journal.html:14
 msgid "Journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:387
+#: rhodecode/templates/base/base.html:388
 msgid "Show Public activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:388
+#: rhodecode/templates/base/base.html:389
 msgid "Public journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:393
-msgid "Show Gists"
-msgstr ""
-
 #: rhodecode/templates/base/base.html:394
+msgid "Show Gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:395
 msgid "Gists"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:398
+#: rhodecode/templates/base/base.html:399
 msgid "Search in repositories you have access to"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:404
+#: rhodecode/templates/base/base.html:405
 msgid "Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:411
+#: rhodecode/templates/base/base.html:412
 msgid "Delegated Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:421
 #: rhodecode/templates/base/base.html:422
+#: rhodecode/templates/base/base.html:423
 #: rhodecode/templates/debug_style/buttons.html:5
 #: rhodecode/templates/debug_style/code-block.html:6
 #: rhodecode/templates/debug_style/collapsable-content.html:5
@@ -5774,15 +6386,15 b' msgstr ""'
 msgid "Style"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:479
+#: rhodecode/templates/base/base.html:480
 msgid "Go to"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:590
+#: rhodecode/templates/base/base.html:591
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:598
+#: rhodecode/templates/base/base.html:599
 msgid "Site-wide shortcuts"
 msgstr ""
 
@@ -5957,7 +6569,7 b' msgstr ""'
 msgid "No permission defined"
 msgstr ""
 
-#: rhodecode/templates/base/root.html:151
+#: rhodecode/templates/base/root.html:120
 msgid "Please enable JavaScript to use RhodeCode Enterprise"
 msgstr ""
 
@@ -6077,6 +6689,22 b' msgstr ""'
 msgid "During the update of a pull request, the position of inline comments will be updated and outdated inline comments will be hidden."
 msgstr ""
 
+#: rhodecode/templates/base/vcs_settings.html:222
+msgid "Labs settings"
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:222
+msgid "These features are considered experimental and may not work as expected."
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:229
+msgid "Mercurial server-side merge"
+msgstr ""
+
+#: rhodecode/templates/base/vcs_settings.html:234
+msgid "Use rebase instead of creating a merge commit when merging via web interface"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
@@ -6091,8 +6719,8 b' msgid "Compare Selected Bookmarks"'
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks_data.html:13
-#: rhodecode/templates/changelog/changelog.html:180
-#: rhodecode/templates/changelog/changelog_summary_data.html:53
+#: rhodecode/templates/changelog/changelog.html:183
+#: rhodecode/templates/changelog/changelog_summary_data.html:62
 #: rhodecode/templates/changeset/changeset.html:92
 #: rhodecode/templates/files/base.html:10
 #, python-format
@@ -6113,8 +6741,8 b' msgid "Compare Selected Branches"'
 msgstr ""
 
 #: rhodecode/templates/branches/branches_data.html:12
-#: rhodecode/templates/changelog/changelog.html:172
-#: rhodecode/templates/changelog/changelog_summary_data.html:67
+#: rhodecode/templates/changelog/changelog.html:175
+#: rhodecode/templates/changelog/changelog_summary_data.html:76
 #: rhodecode/templates/changeset/changeset.html:105
 #: rhodecode/templates/files/base.html:23
 #, python-format
@@ -6144,10 +6772,6 b' msgstr ""'
 msgid "Compare fork with Parent (%s)"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:62
-msgid "Open new pull request"
-msgstr ""
-
 #: rhodecode/templates/changelog/changelog.html:68
 #: rhodecode/templates/changelog/changelog.html:69
 msgid "Clear selection"
@@ -6157,43 +6781,49 b' msgstr ""'
 msgid "Clear filter"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:103
-#: rhodecode/templates/changelog/changelog_summary_data.html:9
-msgid "Age"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:105
+#: rhodecode/templates/changelog/changelog.html:107
 #: rhodecode/templates/files/files_add.html:93
 #: rhodecode/templates/files/files_delete.html:60
 #: rhodecode/templates/files/files_edit.html:96
 msgid "Commit Message"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:108
-#: rhodecode/templates/changelog/changelog_summary_data.html:11
+#: rhodecode/templates/changelog/changelog.html:109
+#: rhodecode/templates/changelog/changelog_summary_data.html:10
+msgid "Age"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:112
+#: rhodecode/templates/changelog/changelog_summary_data.html:12
 msgid "Refs"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:122
-#: rhodecode/templates/changelog/changelog_summary_data.html:22
+#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog_summary_data.html:21
 #, python-format
 msgid ""
 "Commit status: %s\n"
 "Click to open associated pull request #%s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:126
+#: rhodecode/templates/changelog/changelog.html:130
+#: rhodecode/templates/changelog/changelog_summary_data.html:25
 #, python-format
 msgid "Commit status: %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:162
-#: rhodecode/templates/changelog/changelog_summary_data.html:33
+#: rhodecode/templates/changelog/changelog.html:136
+#: rhodecode/templates/changelog/changelog_summary_data.html:31
+msgid "Commit status: Not Reviewed"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:141
+#: rhodecode/templates/changelog/changelog_summary_data.html:36
 msgid "Commit has comments"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:188
-#: rhodecode/templates/changelog/changelog_summary_data.html:60
+#: rhodecode/templates/changelog/changelog.html:191
+#: rhodecode/templates/changelog/changelog_summary_data.html:69
 #: rhodecode/templates/changeset/changeset.html:99
 #: rhodecode/templates/files/base.html:17
 #: rhodecode/templates/tags/tags_data.html:12
@@ -6201,16 +6831,16 b' msgstr ""'
 msgid "Tag %s"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:338
+#: rhodecode/templates/changelog/changelog.html:341
 msgid "Filter changelog"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:411
+#: rhodecode/templates/changelog/changelog.html:414
 msgid "There are no changes yet"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/pullrequests/pullrequest_show.html:358
+#: rhodecode/templates/pullrequests/pullrequest_show.html:362
 msgid "Removed"
 msgstr ""
 
@@ -6241,25 +6871,25 b' msgstr ""'
 msgid "Show File"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:8
+#: rhodecode/templates/changelog/changelog_summary_data.html:9
 #: rhodecode/templates/search/search_commit.html:8
 msgid "Commit message"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:91
+#: rhodecode/templates/changelog/changelog_summary_data.html:100
 msgid "Add or upload files directly via RhodeCode:"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:94
+#: rhodecode/templates/changelog/changelog_summary_data.html:103
 #: rhodecode/templates/files/files_browser.html:25
 msgid "Add New File"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:102
+#: rhodecode/templates/changelog/changelog_summary_data.html:111
 msgid "Push new repo:"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog_summary_data.html:113
+#: rhodecode/templates/changelog/changelog_summary_data.html:122
 msgid "Existing repository?"
 msgstr ""
 
@@ -6335,7 +6965,7 b' msgstr ""'
 
 #: rhodecode/templates/changeset/changeset.html:145
 #: rhodecode/templates/changeset/changeset.html:147
-#: rhodecode/tests/functional/test_changeset_comments.py:217
+#: rhodecode/tests/functional/test_commit_comments.py:263
 #, python-format
 msgid "%d Commit comment"
 msgid_plural "%d Commit comments"
@@ -6346,22 +6976,22 b' msgstr[1] ""'
 #: rhodecode/templates/changeset/changeset.html:153
 #: rhodecode/templates/pullrequests/pullrequest_show.html:145
 #: rhodecode/templates/pullrequests/pullrequest_show.html:147
-#: rhodecode/tests/functional/test_changeset_comments.py:224
+#: rhodecode/tests/functional/test_commit_comments.py:270
 #, python-format
 msgid "%d Inline Comment"
 msgid_plural "%d Inline Comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:177
+#: rhodecode/templates/changeset/changeset.html:175
 msgid "Browse files at current commit"
 msgstr ""
 
+#: rhodecode/templates/changeset/changeset.html:175
+msgid "Browse files"
+msgstr ""
+
 #: rhodecode/templates/changeset/changeset.html:177
-msgid "Browse files"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:179
 #: rhodecode/templates/changeset/changeset_range.html:59
 #: rhodecode/templates/compare/compare_diff.html:255
 #: rhodecode/templates/files/file_diff.html:77
@@ -6369,7 +6999,7 b' msgstr ""'
 msgid "Expand All"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:179
+#: rhodecode/templates/changeset/changeset.html:177
 #: rhodecode/templates/changeset/changeset_range.html:59
 #: rhodecode/templates/compare/compare_diff.html:255
 #: rhodecode/templates/files/file_diff.html:77
@@ -6377,30 +7007,32 b' msgstr ""'
 msgid "Collapse All"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:190
+#: rhodecode/templates/changeset/changeset.html:188
 #: rhodecode/templates/compare/compare_diff.html:263
 #: rhodecode/templates/pullrequests/pullrequest_show.html:274
 msgid "No files"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:227
+#: rhodecode/templates/changeset/changeset.html:225
 #: rhodecode/templates/files/file_diff.html:128
+#: rhodecode/templates/pullrequests/pullrequest_show.html:315
 msgid "Show comments"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:228
+#: rhodecode/templates/changeset/changeset.html:226
 #: rhodecode/templates/files/file_diff.html:129
+#: rhodecode/templates/pullrequests/pullrequest_show.html:316
 msgid "Hide comments"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:245
+#: rhodecode/templates/changeset/changeset.html:243
 #: rhodecode/templates/changeset/diff_block.html:25
 #: rhodecode/templates/changeset/diff_block.html:46
 #: rhodecode/templates/files/file_diff.html:146
 msgid "Diff was truncated. File content available only in full diff."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:245
+#: rhodecode/templates/changeset/changeset.html:243
 #: rhodecode/templates/changeset/diff_block.html:7
 #: rhodecode/templates/changeset/diff_block.html:10
 #: rhodecode/templates/changeset/diff_block.html:25
@@ -6410,22 +7042,22 b' msgstr ""'
 msgid "Showing a big diff might take some time and resources, continue?"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:245
+#: rhodecode/templates/changeset/changeset.html:243
 #: rhodecode/templates/changeset/diff_block.html:7
 #: rhodecode/templates/changeset/diff_block.html:10
 #: rhodecode/templates/changeset/diff_block.html:25
 #: rhodecode/templates/changeset/diff_block.html:46
 #: rhodecode/templates/files/file_diff.html:146
-#: rhodecode/templates/pullrequests/pullrequest_show.html:386
-#: rhodecode/templates/pullrequests/pullrequest_show.html:392
+#: rhodecode/templates/pullrequests/pullrequest_show.html:390
+#: rhodecode/templates/pullrequests/pullrequest_show.html:396
 msgid "Show full diff"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:314
+#: rhodecode/templates/changeset/changeset.html:312
 msgid "No Child Commits"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:350
+#: rhodecode/templates/changeset/changeset.html:348
 msgid "No Parent Commits"
 msgstr ""
 
@@ -6478,6 +7110,8 b' msgstr ""'
 #: rhodecode/templates/changeset/changeset_file_comment.html:146
 #: rhodecode/templates/changeset/changeset_file_comment.html:293
 #: rhodecode/templates/compare/compare_diff.html:57
+#: rhodecode/templates/email_templates/commit_comment.mako:87
+#: rhodecode/templates/email_templates/pull_request_comment.mako:93
 msgid "Comment"
 msgstr ""
 
@@ -6624,12 +7258,15 b' msgid "Compare Commits"'
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:46
+#: rhodecode/templates/email_templates/pull_request_review.mako:50
 #: rhodecode/templates/files/file_diff.html:56
 #: rhodecode/templates/pullrequests/pullrequest_show.html:85
 msgid "Target"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.html:47
+#: rhodecode/templates/email_templates/pull_request_comment.mako:92
+#: rhodecode/templates/email_templates/pull_request_review.mako:49
 #: rhodecode/templates/files/file_diff.html:62
 #: rhodecode/templates/files/files_source.html:18
 msgid "Source"
@@ -6679,36 +7316,36 b' msgstr ""'
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:127
+#: rhodecode/templates/data_table/_dt_elements.html:129
 msgid "Creating"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:129
+#: rhodecode/templates/data_table/_dt_elements.html:131
 msgid "Created"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:175
+#: rhodecode/templates/data_table/_dt_elements.html:177
 #, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:201
+#: rhodecode/templates/data_table/_dt_elements.html:203
 #, python-format
 msgid "Confirm to delete this user group: %s"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:218
+#: rhodecode/templates/data_table/_dt_elements.html:220
 msgid "User group"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:262
+#: rhodecode/templates/data_table/_dt_elements.html:264
 #: rhodecode/templates/forks/fork.html:81
 msgid "Private"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:287
+#: rhodecode/templates/data_table/_dt_elements.html:289
 #, python-format
 msgid "Pull request #%(pr_number)s"
 msgstr ""
@@ -6812,85 +7449,130 b' msgstr ""'
 msgid "Form vertical"
 msgstr ""
 
-#: rhodecode/templates/email_templates/base.mako:16
+#: rhodecode/templates/email_templates/base.mako:7
 #, python-format
 msgid "This is a notification from RhodeCode. %(instance_url)s"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:5
-#: rhodecode/templates/email_templates/pull_request_comment.mako:5
+#: rhodecode/templates/email_templates/base.mako:90
+msgid "RhodeCode"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:16
+#: rhodecode/templates/email_templates/pull_request_comment.mako:17
 msgid "[mention]"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:5
-#, python-format
-msgid "%(user)s commented on commit of %(repo_name)s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:14
-#: rhodecode/templates/email_templates/commit_comment.mako:41
-#: rhodecode/templates/email_templates/pull_request_comment.mako:15
-#: rhodecode/templates/email_templates/pull_request_comment.mako:51
-msgid "Comment link"
+#: rhodecode/templates/email_templates/commit_comment.mako:19
+#, python-format
+msgid "%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:19
+#: rhodecode/templates/email_templates/commit_comment.mako:22
+#: rhodecode/templates/email_templates/commit_comment.mako:24
+#, python-format
+msgid "in the %(repo_name)s repository"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:22
+#, python-format
+msgid "%(user)s commented on commit `%(commit_id)s` (status: %(status)s)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:24
+#: rhodecode/templates/email_templates/commit_comment.mako:78
+#, python-format
+msgid "%(user)s commented on commit `%(commit_id)s`"
+msgstr ""
+
 #: rhodecode/templates/email_templates/commit_comment.mako:43
-#: rhodecode/templates/email_templates/pull_request_comment.mako:20
-#: rhodecode/templates/email_templates/pull_request_comment.mako:54
+#: rhodecode/templates/email_templates/pull_request_comment.mako:43
+msgid "Comment link"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:48
+#: rhodecode/templates/email_templates/pull_request_comment.mako:48
 #, python-format
 msgid "File: %(comment_file)s on line %(comment_line)s"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:28
-#: rhodecode/templates/email_templates/commit_comment.mako:56
+#: rhodecode/templates/email_templates/commit_comment.mako:54
 msgid "Commit status was changed to"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:35
-#, python-format
-msgid "%(user)s commented on a file in commit of %(repo_url)s."
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:37
-#, python-format
-msgid "%(user)s commented on a commit of %(repo_url)s."
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:47
-#: rhodecode/templates/files/files_detail.html:5
-#: rhodecode/templates/files/files_detail.html:12
-msgid "Commit Description"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:5
-#, python-format
-msgid "%(user)s commented on pull request #%(pr_id)s: \"%(pr_title)s\""
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:17
-#: rhodecode/templates/email_templates/pull_request_comment.mako:52
+#: rhodecode/templates/email_templates/commit_comment.mako:76
+#, python-format
+msgid "%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:76
+#: rhodecode/templates/email_templates/commit_comment.mako:78
+#, python-format
+msgid "in the %(repo)s repository"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:85
+msgid "Status"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:85
+msgid "The commit status was changed to"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:87
+#: rhodecode/templates/email_templates/pull_request_comment.mako:93
+#, python-format
+msgid "Comment on line: %(comment_line)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.mako:30
+msgid "Generate new password here"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:20
+#, python-format
+msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file: `%(comment_file)s`)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:23
+#, python-format
+msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (status: %(status)s)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:25
+#: rhodecode/templates/email_templates/pull_request_comment.mako:82
+#, python-format
+msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\""
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:45
 msgid "Source repository"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_comment.mako:29
-#: rhodecode/templates/email_templates/pull_request_comment.mako:63
-msgid "Pull request status was changed to"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:31
-#: rhodecode/templates/email_templates/pull_request_comment.mako:65
-msgid "Pull request was closed with status"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:37
-#, python-format
-msgid "%(user)s commented on a file on pull request #%(pr_id)s: \"%(pr_title)s\"."
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:43
-#, python-format
-msgid "%(user)s commented on a pull request #%(pr_id)s \"%(pr_title)s\"."
+#: rhodecode/templates/email_templates/pull_request_comment.mako:54
+#, python-format
+msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s*"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:56
+#, python-format
+msgid "%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:80
+#, python-format
+msgid "%(user)s commented on pull request #%(pr_id)s \"%(pr_title)s\" (file:`%(comment_file)s`)"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:86
+#, python-format
+msgid "submitted pull request status: %(status)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:88
+#, python-format
+msgid "submitted pull request status: %(status)s and closed"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:5
@@ -6899,18 +7581,15 b' msgid "%(user)s wants you to review pull'
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:17
-#: rhodecode/templates/email_templates/pull_request_review.mako:54
 #, python-format
 msgid "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s into %(target_ref_type)s:%(target_ref_name)s"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:26
-#: rhodecode/templates/email_templates/pull_request_review.mako:63
 msgid "Link"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_review.mako:35
-#: rhodecode/templates/email_templates/pull_request_review.mako:72
 #, python-format
 msgid "Commit (%(num)s)"
 msgid_plural "Commits (%(num)s)"
@@ -6922,6 +7601,25 b' msgstr[1] ""'
 msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"."
 msgstr ""
 
+#: rhodecode/templates/email_templates/pull_request_review.mako:49
+#, python-format
+msgid "%(source_ref_type)s of %(source_repo_url)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_review.mako:50
+#, python-format
+msgid "%(target_ref_type)s of %(target_repo_url)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_review.mako:52
+#: rhodecode/templates/summary/components.html:95
+#: rhodecode/templates/summary/components.html:98
+#, python-format
+msgid "%(num)s Commit"
+msgid_plural "%(num)s Commits"
+msgstr[0] ""
+msgstr[1] ""
+
 #: rhodecode/templates/email_templates/test.mako:5
 msgid "hello \"world\""
 msgstr ""
@@ -6930,6 +7628,21 b' msgstr ""'
 msgid "Translation"
 msgstr ""
 
+#: rhodecode/templates/email_templates/user_registration.mako:22
+#, python-format
+msgid "New user %(user)s has registered on %(date)s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/user_registration.mako:24
+msgid "Full Name"
+msgstr ""
+
+#: rhodecode/templates/email_templates/user_registration.mako:26
+#: rhodecode/templates/users/user.html:29
+#: rhodecode/templates/users/user_profile.html:5
+msgid "Profile"
+msgstr ""
+
 #: rhodecode/templates/errors/error_document.html:39
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
@@ -6941,8 +7654,8 b' msgid "%(user)s commited on %(date)s UTC'
 msgstr ""
 
 #: rhodecode/templates/feed/atom_feed_entry.mako:26
-#: rhodecode/templates/pullrequests/pullrequest_show.html:386
-#: rhodecode/templates/pullrequests/pullrequest_show.html:392
+#: rhodecode/templates/pullrequests/pullrequest_show.html:390
+#: rhodecode/templates/pullrequests/pullrequest_show.html:396
 msgid "Commit was too big and was cut off..."
 msgstr ""
 
@@ -6986,7 +7699,7 b' msgstr[1] ""'
 msgid "Show All"
 msgstr ""
 
-#: rhodecode/templates/files/file_authors_box.html:26
+#: rhodecode/templates/files/file_authors_box.html:25
 msgid "last author"
 msgstr ""
 
@@ -7021,7 +7734,7 b' msgstr ""'
 msgid "%s Files"
 msgstr ""
 
-#: rhodecode/templates/files/files.html:143
+#: rhodecode/templates/files/files.html:131
 msgid "Switch To Commit"
 msgstr ""
 
@@ -7117,22 +7830,18 b' msgstr ""'
 msgid "Loading file list..."
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:50
+#: rhodecode/templates/files/files_browser_tree.html:6
 msgid "Size"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:51
+#: rhodecode/templates/files/files_browser_tree.html:7
 msgid "Modified"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:52
+#: rhodecode/templates/files/files_browser_tree.html:8
 msgid "Last Commit"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.html:89
-msgid "Loading..."
-msgstr ""
-
 #: rhodecode/templates/files/files_delete.html:4
 #, python-format
 msgid "%s Files Delete"
@@ -7157,6 +7866,11 b' msgstr ""'
 msgid "Delete File"
 msgstr ""
 
+#: rhodecode/templates/files/files_detail.html:5
+#: rhodecode/templates/files/files_detail.html:12
+msgid "Commit Description"
+msgstr ""
+
 #: rhodecode/templates/files/files_detail.html:35
 msgid "File last commit"
 msgstr ""
@@ -7315,7 +8029,7 b' msgstr ""'
 msgid "Forked"
 msgstr ""
 
-#: rhodecode/templates/forks/forks_data.html:48
+#: rhodecode/templates/forks/forks_data.html:46
 msgid "There are no forks yet"
 msgstr ""
 
@@ -7331,7 +8045,7 b' msgstr ""'
 msgid "RSS journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal_data.html:53
+#: rhodecode/templates/journal/journal_data.html:51
 msgid "No entries yet"
 msgstr ""
 
@@ -7503,13 +8217,13 b' msgid_plural "Compare View: %s commits"'
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:330
-#: rhodecode/templates/pullrequests/pullrequest_show.html:365
+#: rhodecode/templates/pullrequests/pullrequest_show.html:334
+#: rhodecode/templates/pullrequests/pullrequest_show.html:369
 msgid "Outdated Inline Comments"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:386
-#: rhodecode/templates/pullrequests/pullrequest_show.html:392
+#: rhodecode/templates/pullrequests/pullrequest_show.html:390
+#: rhodecode/templates/pullrequests/pullrequest_show.html:396
 msgid "Showing a huge diff might take some time and resources"
 msgstr ""
 
@@ -7688,14 +8402,6 b' msgstr ""'
 msgid "Information"
 msgstr ""
 
-#: rhodecode/templates/summary/components.html:95
-#: rhodecode/templates/summary/components.html:98
-#, python-format
-msgid "%(num)s Commit"
-msgid_plural "%(num)s Commits"
-msgstr[0] ""
-msgstr[1] ""
-
 #: rhodecode/templates/summary/components.html:102
 msgid "Number of Repository Forks"
 msgstr ""
@@ -7759,11 +8465,6 b' msgstr ""'
 msgid "Compare Selected Tags"
 msgstr ""
 
-#: rhodecode/templates/users/user.html:29
-#: rhodecode/templates/users/user_profile.html:5
-msgid "Profile"
-msgstr ""
-
 #: rhodecode/templates/users/user_profile.html:35
 msgid "First name"
 msgstr ""

rhodecode/lib/base.py

@@ -205,11 +205,12 b' def vcs_operation_context('
 
 class BasicAuth(AuthBasicAuthenticator):
 
-    def __init__(self, realm, authfunc, auth_http_code=None,
+    def __init__(self, realm, authfunc, registry, auth_http_code=None,
                  initial_call_detection=False):
         self.realm = realm
         self.initial_call = initial_call_detection
         self.authfunc = authfunc
+        self.registry = registry
         self._rc_auth_http_code = auth_http_code
 
     def _get_response_from_code(self, http_code):
@@ -242,7 +243,8 b' class BasicAuth(AuthBasicAuthenticator):'
         if len(_parts) == 2:
             username, password = _parts
             if self.authfunc(
-                    username, password, environ, VCS_TYPE):
+                    username, password, environ, VCS_TYPE,
+                    registry=self.registry):
                 return username
             if username and password:
                 # we mark that we actually executed authentication once, at
@@ -254,7 +256,11 b' class BasicAuth(AuthBasicAuthenticator):'
     __call__ = authenticate
 
 
-def attach_context_attributes(context):
+def attach_context_attributes(context, request):
+    """
+    Attach variables into template context called `c`, please note that
+    request could be pylons or pyramid request in here.
+    """
     rc_config = SettingsModel().get_all_settings(cache=True)
 
     context.rhodecode_version = rhodecode.__version__
@@ -320,6 +326,36 b' def attach_context_attributes(context):'
         'appenlight.api_public_key', '')
     context.appenlight_server_url = config.get('appenlight.server_url', '')
 
+    # JS template context
+    context.template_context = {
+        'repo_name': None,
+        'repo_type': None,
+        'repo_landing_commit': None,
+        'rhodecode_user': {
+            'username': None,
+            'email': None,
+            'notification_status': False
+        },
+        'visual': {
+            'default_renderer': None
+        },
+        'commit_data': {
+            'commit_id': None
+        },
+        'pull_request_data': {'pull_request_id': None},
+        'timeago': {
+            'refresh_time': 120 * 1000,
+            'cutoff_limit': 1000 * 60 * 60 * 24 * 7
+        },
+        'pylons_dispatch': {
+            # 'controller': request.environ['pylons.routes_dict']['controller'],
+            # 'action': request.environ['pylons.routes_dict']['action'],
+        },
+        'pyramid_dispatch': {
+
+        },
+        'extra': {'plugins': {}}
+    }
     # END CONFIG VARS
 
     # TODO: This dosn't work when called from pylons compatibility tween.
@@ -380,7 +416,7 b' class BaseController(WSGIController):'
         """
         # on each call propagate settings calls into global settings.
         set_rhodecode_config(config)
-        attach_context_attributes(c)
+        attach_context_attributes(c, request)
 
         # TODO: Remove this when fixed in attach_context_attributes()
         c.repo_name = get_repo_slug(request)  # can be empty

rhodecode/lib/caches.py

@@ -21,6 +21,7 b''
 
 import beaker
 import logging
+import threading
 
 from beaker.cache import _cache_decorate, cache_regions, region_invalidate
 
@@ -35,7 +36,7 b" FILE_SEARCH_TREE_META = 'cache_file_sear"
 SUMMARY_STATS = 'cache_summary_stats'
 
 # This list of caches gets purged when invalidation happens
-USED_REPO_CACHES = (FILE_TREE, FILE_TREE_META, FILE_TREE_META)
+USED_REPO_CACHES = (FILE_TREE, FILE_SEARCH_TREE_META)
 
 DEFAULT_CACHE_MANAGER_CONFIG = {
     'type': 'memorylru_base',
@@ -170,7 +171,7 b' class InvalidationContext(object):'
             safe_str(self.repo_name), safe_str(self.cache_type))
 
     def __init__(self, compute_func, repo_name, cache_type,
-                 raise_exception=False):
+                 raise_exception=False, thread_scoped=False):
         self.compute_func = compute_func
         self.repo_name = repo_name
         self.cache_type = cache_type
@@ -178,6 +179,13 b' class InvalidationContext(object):'
             repo_name, cache_type)
         self.raise_exception = raise_exception
 
+        # Append the thread id to the cache key if this invalidation context
+        # should be scoped to the current thread.
+        if thread_scoped:
+            thread_id = threading.current_thread().ident
+            self.cache_key = '{cache_key}_{thread_id}'.format(
+                cache_key=self.cache_key, thread_id=thread_id)
+
     def get_cache_obj(self):
         cache_key = CacheKey.get_cache_key(
             self.repo_name, self.cache_type)

rhodecode/lib/celerylib/__init__.py

@@ -22,6 +22,7 b' celery libs for RhodeCode'
 """
 
 
+import pylons
 import socket
 import logging
 
@@ -29,16 +30,23 b' import rhodecode'
 
 from os.path import join as jn
 from pylons import config
+from celery.task import Task
+from pyramid.request import Request
+from pyramid.scripting import prepare
+from pyramid.threadlocal import get_current_request
 
 from decorator import decorator
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
 from rhodecode.config import utils
-from rhodecode.lib.utils2 import safe_str, md5_safe, aslist
+from rhodecode.lib.utils2 import (
+    safe_str, md5_safe, aslist, get_routes_generator_for_server_url,
+    get_server_url)
 from rhodecode.lib.pidlock import DaemonLock, LockHeld
 from rhodecode.lib.vcs import connect_vcs
 from rhodecode.model import meta
+from rhodecode.lib.auth import AuthUser
 
 log = logging.getLogger(__name__)
 
@@ -52,6 +60,76 b' class ResultWrapper(object):'
         return self.task
 
 
+class RhodecodeCeleryTask(Task):
+    """
+    This is a celery task which will create a rhodecode app instance context
+    for the task, patch pyramid + pylons threadlocals with the original request
+    that created the task and also add the user to the context.
+
+    This class as a whole should be removed once the pylons port is complete
+    and a pyramid only solution for celery is implemented as per issue #4139
+    """
+
+    def apply_async(self, args=None, kwargs=None, task_id=None, producer=None,
+                    link=None, link_error=None, **options):
+        """ queue the job to run (we are in web request context here) """
+
+        request = get_current_request()
+
+        if request:
+            # we hook into kwargs since it is the only way to pass our data to
+            # the celery worker in celery 2.2
+            kwargs.update({
+                '_rhodecode_proxy_data': {
+                    'environ': {
+                        'PATH_INFO': request.environ['PATH_INFO'],
+                        'SCRIPT_NAME': request.environ['SCRIPT_NAME'],
+                        'HTTP_HOST': request.environ.get('HTTP_HOST',
+                            request.environ['SERVER_NAME']),
+                        'SERVER_NAME': request.environ['SERVER_NAME'],
+                        'SERVER_PORT': request.environ['SERVER_PORT'],
+                        'wsgi.url_scheme': request.environ['wsgi.url_scheme'],
+                    },
+                    'auth_user': {
+                        'ip_addr': request.user.ip_addr,
+                        'user_id': request.user.user_id
+                    },
+                }
+            })
+        return super(RhodecodeCeleryTask, self).apply_async(
+            args, kwargs, task_id, producer, link, link_error, **options)
+
+    def __call__(self, *args, **kwargs):
+        """ rebuild the context and then run task on celery worker """
+        proxy_data = kwargs.pop('_rhodecode_proxy_data', {})
+
+        if not proxy_data:
+            return super(RhodecodeCeleryTask, self).__call__(*args, **kwargs)
+
+        log.debug('using celery proxy data to run task: %r', proxy_data)
+
+        from rhodecode.config.routing import make_map
+
+        request = Request.blank('/', environ=proxy_data['environ'])
+        request.user = AuthUser(user_id=proxy_data['auth_user']['user_id'],
+                                ip_addr=proxy_data['auth_user']['ip_addr'])
+
+        pyramid_request = prepare(request) # set pyramid threadlocal request
+
+        # pylons routing
+        if not rhodecode.CONFIG.get('routes.map'):
+            rhodecode.CONFIG['routes.map'] = make_map(config)
+        pylons.url._push_object(get_routes_generator_for_server_url(
+            get_server_url(request.environ)
+        ))
+
+        try:
+            return super(RhodecodeCeleryTask, self).__call__(*args, **kwargs)
+        finally:
+            pyramid_request['closer']()
+            pylons.url._pop_object()
+
+
 def run_task(task, *args, **kwargs):
     if rhodecode.CELERY_ENABLED:
         celery_is_up = False
@@ -131,16 +209,16 b' def dbsession(func):'
 def vcsconnection(func):
     def __wrapper(func, *fargs, **fkwargs):
         if rhodecode.CELERY_ENABLED and not rhodecode.CELERY_EAGER:
-            backends = config['vcs.backends'] = aslist(
-                config.get('vcs.backends', 'hg,git'), sep=',')
+            settings = rhodecode.PYRAMID_SETTINGS
+            backends = settings['vcs.backends']
             for alias in rhodecode.BACKENDS.keys():
                 if alias not in backends:
                     del rhodecode.BACKENDS[alias]
-            utils.configure_pyro4(config)
-            utils.configure_vcs(config)
+            utils.configure_pyro4(settings)
+            utils.configure_vcs(settings)
             connect_vcs(
-                config['vcs.server'],
-                utils.get_vcs_server_protocol(config))
+                settings['vcs.server'],
+                utils.get_vcs_server_protocol(settings))
         ret = func(*fargs, **fkwargs)
         return ret
 

rhodecode/lib/celerylib/tasks.py

@@ -33,7 +33,7 b' from pylons import config'
 import rhodecode
 from rhodecode.lib.celerylib import (
     run_task, dbsession, __get_lockkey, LockHeld, DaemonLock,
-    get_session, vcsconnection)
+    get_session, vcsconnection, RhodecodeCeleryTask)
 from rhodecode.lib.hooks_base import log_create_repository
 from rhodecode.lib.rcmail.smtp_mailer import SmtpMailer
 from rhodecode.lib.utils import add_cache, action_logger
@@ -56,7 +56,7 b' def get_logger(cls):'
     return log
 
 
-@task(ignore_result=True)
+@task(ignore_result=True, base=RhodecodeCeleryTask)
 @dbsession
 def send_email(recipients, subject, body='', html_body='', email_config=None):
     """
@@ -70,7 +70,7 b' def send_email(recipients, subject, body'
     """
     log = get_logger(send_email)
 
-    email_config = email_config or config
+    email_config = email_config or rhodecode.CONFIG
     subject = "%s %s" % (email_config.get('email_prefix', ''), subject)
     if not recipients:
         # if recipients are not defined we send to email_config + all admins
@@ -104,7 +104,7 b' def send_email(recipients, subject, body'
     return True
 
 
-@task(ignore_result=False)
+@task(ignore_result=True, base=RhodecodeCeleryTask)
 @dbsession
 @vcsconnection
 def create_repo(form_data, cur_user):
@@ -197,7 +197,7 b' def create_repo(form_data, cur_user):'
     return True
 
 
-@task(ignore_result=False)
+@task(ignore_result=True, base=RhodecodeCeleryTask)
 @dbsession
 @vcsconnection
 def create_repo_fork(form_data, cur_user):

rhodecode/lib/celerypylons/loader.py

@@ -18,15 +18,16 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import pylons
+import rhodecode
+
 from celery.loaders.base import BaseLoader
-from pylons import config
 
 to_pylons = lambda x: x.replace('_', '.').lower()
 to_celery = lambda x: x.replace('.', '_').upper()
 
 LIST_PARAMS = """CELERY_IMPORTS ADMINS ROUTES""".split()
 
-
 class PylonsSettingsProxy(object):
     """Pylons Settings Proxy
 
@@ -35,9 +36,11 b' class PylonsSettingsProxy(object):'
     """
     def __getattr__(self, key):
         pylons_key = to_pylons(key)
+        proxy_config = rhodecode.PYRAMID_SETTINGS or pylons.config
         try:
-            value = config[pylons_key]
-            if key in LIST_PARAMS:return value.split()
+            value = proxy_config[pylons_key]
+            if key in LIST_PARAMS:
+                return value.split()
             return self.type_converter(value)
         except KeyError:
             raise AttributeError(pylons_key)
@@ -56,7 +59,8 b' class PylonsSettingsProxy(object):'
 
     def __setattr__(self, key, value):
         pylons_key = to_pylons(key)
-        config[pylons_key] = value
+        proxy_config = rhodecode.PYRAMID_SETTINGS or pylons.config
+        proxy_config[pylons_key] = value
 
     def __setitem__(self, key, value):
         self.__setattr__(key, value)
@@ -86,3 +90,8 b' class PylonsLoader(BaseLoader):'
         Import task modules.
         """
         self.import_default_modules()
+        from rhodecode.config.middleware import make_pyramid_app
+
+        # adding to self to keep a reference around
+        self.pyramid_app = make_pyramid_app(
+            pylons.config, **pylons.config['app_conf'])

rhodecode/lib/diffs.py

@@ -49,11 +49,11 b' class OPS(object):'
 def wrap_to_table(str_):
     return '''<table class="code-difftable">
                 <tr class="line no-comment">
-                <td class="add-comment-line"><span class="add-comment-content"></span></td>
+                <td class="add-comment-line tooltip" title="%s"><span class="add-comment-content"></span></td>
                 <td class="lineno new"></td>
                 <td class="code no-comment"><pre>%s</pre></td>
                 </tr>
-              </table>''' % str_
+              </table>''' % (_('Click to comment'), str_)
 
 
 def wrapped_diff(filenode_old, filenode_new, diff_limit=None, file_limit=None,
@@ -626,7 +626,9 b' class DiffProcessor(object):'
             """
 
             if condition:
-                return '''<a href="%(url)s">%(label)s</a>''' % {
+                return '''<a href="%(url)s" class="tooltip"
+                title="%(title)s">%(label)s</a>''' % {
+                    'title': _('Click to select line'),
                     'url': url,
                     'label': label
                 }

rhodecode/lib/helpers.py

@@ -44,7 +44,7 b' from pygments.formatters.html import Htm'
 from pygments import highlight as code_highlight
 from pygments.lexers import (
     get_lexer_by_name, get_lexer_for_filename, get_lexer_for_mimetype)
-from pylons import url
+from pylons import url as pylons_url
 from pylons.i18n.translation import _, ungettext
 from pyramid.threadlocal import get_current_request
 
@@ -69,6 +69,7 b' from webhelpers2.number import format_by'
 
 from rhodecode.lib.annotate import annotate_highlight
 from rhodecode.lib.action_parser import action_parser
+from rhodecode.lib.ext_json import json
 from rhodecode.lib.utils import repo_name_slug, get_custom_lexer
 from rhodecode.lib.utils2 import str2bool, safe_unicode, safe_str, \
     get_commit_safe, datetime_to_time, time_to_datetime, time_to_utcdatetime, \
@@ -84,10 +85,46 b' from rhodecode.model.settings import Iss'
 
 log = logging.getLogger(__name__)
 
+
 DEFAULT_USER = User.DEFAULT_USER
 DEFAULT_USER_EMAIL = User.DEFAULT_USER_EMAIL
 
 
+def url(*args, **kw):
+    return pylons_url(*args, **kw)
+
+
+def pylons_url_current(*args, **kw):
+    """
+    This function overrides pylons.url.current() which returns the current
+    path so that it will also work from a pyramid only context. This
+    should be removed once port to pyramid is complete.
+    """
+    if not args and not kw:
+        request = get_current_request()
+        return request.path
+    return pylons_url.current(*args, **kw)
+
+url.current = pylons_url_current
+
+
+def asset(path, ver=None):
+    """
+    Helper to generate a static asset file path for rhodecode assets
+
+    eg. h.asset('images/image.png', ver='3923')
+
+    :param path: path of asset
+    :param ver: optional version query param to append as ?ver=
+    """
+    request = get_current_request()
+    query = {}
+    if ver:
+        query = {'ver': ver}
+    return request.static_path(
+        'rhodecode:public/{}'.format(path), _query=query)
+
+
 def html_escape(text, html_escape_table=None):
     """Produce entities within text."""
     if not html_escape_table:
@@ -771,19 +808,17 b' def discover_user(author):'
 def email_or_none(author):
     # extract email from the commit string
     _email = author_email(author)
+
+    # If we have an email, use it, otherwise
+    # see if it contains a username we can get an email from
     if _email != '':
-        # check it against RhodeCode database, and use the MAIN email for this
-        # user
-        user = User.get_by_email(_email, case_insensitive=True, cache=True)
-        if user is not None:
-            return user.email
         return _email
+    else:
+        user = User.get_by_username(
+            author_name(author), case_insensitive=True, cache=True)
 
-    # See if it contains a username we can get an email from
-    user = User.get_by_username(author_name(author), case_insensitive=True,
-                                cache=True)
     if user is not None:
-        return user.email
+            return user.email
 
     # No valid email, not a valid user in the system, none!
     return None
@@ -819,6 +854,20 b' def person(author, show_attr="username_a'
         return _author or _email
 
 
+def author_string(email):
+    if email:
+        user = User.get_by_email(email, case_insensitive=True, cache=True)
+        if user:
+            if user.firstname or user.lastname:
+                return '%s %s <%s>' % (user.firstname, user.lastname, email)
+            else:
+                return email
+        else:
+            return email
+    else:
+        return None
+
+
 def person_by_id(id_, show_attr="username_and_name"):
     # attr to return from fetched user
     person_getter = lambda usr: getattr(usr, show_attr)
@@ -905,7 +954,8 b' def bool2icon(value):'
 #==============================================================================
 from rhodecode.lib.auth import HasPermissionAny, HasPermissionAll, \
 HasRepoPermissionAny, HasRepoPermissionAll, HasRepoGroupPermissionAll, \
-HasRepoGroupPermissionAny, HasRepoPermissionAnyApi, get_csrf_token
+HasRepoGroupPermissionAny, HasRepoPermissionAnyApi, get_csrf_token, \
+csrf_token_key
 
 
 #==============================================================================
@@ -1601,7 +1651,7 b' def urlify_commits(text_, repository):'
             'pref': pref,
             'cls': 'revision-link',
             'url': url('changeset_home', repo_name=repository,
-                       revision=commit_id),
+                       revision=commit_id, qualified=True),
             'commit_id': commit_id,
             'suf': suf
         }
@@ -1611,7 +1661,8 b' def urlify_commits(text_, repository):'
     return newtext
 
 
-def _process_url_func(match_obj, repo_name, uid, entry):
+def _process_url_func(match_obj, repo_name, uid, entry,
+                      return_raw_data=False):
     pref = ''
     if match_obj.group().startswith(' '):
         pref = ' '
@@ -1637,7 +1688,7 b' def _process_url_func(match_obj, repo_na'
     named_vars.update(match_obj.groupdict())
     _url = string.Template(entry['url']).safe_substitute(**named_vars)
 
-    return tmpl % {
+    data = {
         'pref': pref,
         'cls': 'issue-tracker-link',
         'url': _url,
@@ -1645,9 +1696,15 b' def _process_url_func(match_obj, repo_na'
         'issue-prefix': entry['pref'],
         'serv': entry['url'],
     }
+    if return_raw_data:
+        return {
+            'id': issue_id,
+            'url': _url
+        }
+    return tmpl % data
 
 
-def process_patterns(text_string, repo_name, config):
+def process_patterns(text_string, repo_name, config=None):
     repo = None
     if repo_name:
         # Retrieving repo_name to avoid invalid repo_name to explode on
@@ -1657,11 +1714,9 b' def process_patterns(text_string, repo_n'
     settings_model = IssueTrackerSettingsModel(repo=repo)
     active_entries = settings_model.get_settings(cache=True)
 
+    issues_data = []
     newtext = text_string
     for uid, entry in active_entries.items():
-        url_func = partial(
-            _process_url_func, repo_name=repo_name, entry=entry, uid=uid)
-
         log.debug('found issue tracker entry with uid %s' % (uid,))
 
         if not (entry['pat'] and entry['url']):
@@ -1679,10 +1734,20 b' def process_patterns(text_string, repo_n'
                 entry['pat'])
             continue
 
+        data_func = partial(
+            _process_url_func, repo_name=repo_name, entry=entry, uid=uid,
+            return_raw_data=True)
+
+        for match_obj in pattern.finditer(text_string):
+            issues_data.append(data_func(match_obj))
+
+        url_func = partial(
+            _process_url_func, repo_name=repo_name, entry=entry, uid=uid)
+
         newtext = pattern.sub(url_func, newtext)
         log.debug('processed prefix:uid `%s`' % (uid,))
 
-    return newtext
+    return newtext, issues_data
 
 
 def urlify_commit_message(commit_text, repository=None):
@@ -1694,22 +1759,22 b' def urlify_commit_message(commit_text, r'
     :param repository:
     """
     from pylons import url  # doh, we need to re-import url to mock it later
-    from rhodecode import CONFIG
 
     def escaper(string):
         return string.replace('<', '&lt;').replace('>', '&gt;')
 
     newtext = escaper(commit_text)
+
+    # extract http/https links and make them real urls
+    newtext = urlify_text(newtext, safe=False)
+
     # urlify commits - extract commit ids and make link out of them, if we have
     # the scope of repository present.
     if repository:
         newtext = urlify_commits(newtext, repository)
 
-    # extract http/https links and make them real urls
-    newtext = urlify_text(newtext, safe=False)
-
     # process issue tracker patterns
-    newtext = process_patterns(newtext, repository or '', CONFIG)
+    newtext, issues = process_patterns(newtext, repository or '')
 
     return literal(newtext)
 
@@ -1721,21 +1786,11 b' def rst(source, mentions=False):'
 
 def markdown(source, mentions=False):
     return literal('<div class="markdown-block">%s</div>' %
-                   MarkupRenderer.markdown(source, flavored=False,
+                   MarkupRenderer.markdown(source, flavored=True,
                                            mentions=mentions))
 
 def renderer_from_filename(filename, exclude=None):
-    from rhodecode.config.conf import MARKDOWN_EXTS, RST_EXTS
-
-    def _filter(elements):
-        if isinstance(exclude, (list, tuple)):
-            return [x for x in elements if x not in exclude]
-        return elements
-
-    if filename.endswith(tuple(_filter([x[0] for x in MARKDOWN_EXTS if x[0]]))):
-        return 'markdown'
-    if filename.endswith(tuple(_filter([x[0] for x in RST_EXTS if x[0]]))):
-        return 'rst'
+    return MarkupRenderer.renderer_from_filename(filename, exclude=exclude)
 
 
 def render(source, renderer='rst', mentions=False):
@@ -1827,11 +1882,15 b' def secure_form(url, method="POST", mult'
 
     """
     from webhelpers.pylonslib.secure_form import insecure_form
-    from rhodecode.lib.auth import get_csrf_token, csrf_token_key
     form = insecure_form(url, method, multipart, **attrs)
-    token = HTML.div(hidden(csrf_token_key, get_csrf_token()), style="display: none;")
+    token = csrf_input()
     return literal("%s\n%s" % (form, token))
 
+def csrf_input():
+    return literal(
+        '<input type="hidden" id="{}" name="{}" value="{}">'.format(
+        csrf_token_key, csrf_token_key, get_csrf_token()))
+
 def dropdownmenu(name, selected, options, enable_filter=False, **attrs):
     select_html = select(name, selected, options, **attrs)
     select2 = """
@@ -1887,6 +1946,16 b' def route_path(*args, **kwds):'
     return req.route_path(*args, **kwds)
 
 
+def static_url(*args, **kwds):
+    """
+    Wrapper around pyramids `route_path` function. It is used to generate
+    URLs from within pylons views or templates. This will be removed when
+    pyramid migration if finished.
+    """
+    req = get_current_request()
+    return req.static_url(*args, **kwds)
+
+
 def resource_path(*args, **kwds):
     """
     Wrapper around pyramids `route_path` function. It is used to generate

rhodecode/lib/hooks_base.py

@@ -27,6 +27,7 b' import os'
 import collections
 
 import rhodecode
+from rhodecode import events
 from rhodecode.lib import helpers as h
 from rhodecode.lib.utils import action_logger
 from rhodecode.lib.utils2 import safe_str
@@ -102,6 +103,9 b' def pre_push(extras):'
     # Calling hooks after checking the lock, for consistent behavior
     pre_push_extension(repo_store_path=Repository.base_path(), **extras)
 
+    events.trigger(events.RepoPrePushEvent(repo_name=extras.repository,
+                                           extras=extras))
+
     return HookResponse(0, output)
 
 
@@ -128,6 +132,8 b' def pre_pull(extras):'
 
     # Calling hooks after checking the lock, for consistent behavior
     pre_pull_extension(**extras)
+    events.trigger(events.RepoPrePullEvent(repo_name=extras.repository,
+                                           extras=extras))
 
     return HookResponse(0, output)
 
@@ -138,6 +144,8 b' def post_pull(extras):'
     action = 'pull'
     action_logger(user, action, extras.repository, extras.ip, commit=True)
 
+    events.trigger(events.RepoPullEvent(repo_name=extras.repository,
+                                        extras=extras))
     # extension hook call
     post_pull_extension(**extras)
 
@@ -171,6 +179,10 b' def post_push(extras):'
     action_logger(
         extras.username, action, extras.repository, extras.ip, commit=True)
 
+    events.trigger(events.RepoPushEvent(repo_name=extras.repository,
+                                        pushed_commit_ids=commit_ids,
+                                        extras=extras))
+
     # extension hook call
     post_push_extension(
         repo_store_path=Repository.base_path(),

rhodecode/lib/hooks_daemon.py

@@ -20,14 +20,19 b''
 
 import json
 import logging
+import urlparse
 import threading
 from BaseHTTPServer import BaseHTTPRequestHandler
 from SocketServer import TCPServer
+from routes.util import URLGenerator
 
 import Pyro4
+import pylons
+import rhodecode
 
 from rhodecode.lib import hooks_base
-from rhodecode.lib.utils2 import AttributeDict
+from rhodecode.lib.utils2 import (
+    AttributeDict, safe_str, get_routes_generator_for_server_url)
 
 
 log = logging.getLogger(__name__)
@@ -194,10 +199,14 b' def prepare_callback_daemon(extras, prot'
         callback_daemon = DummyHooksCallbackDaemon()
         extras['hooks_module'] = callback_daemon.hooks_module
     else:
-        callback_daemon = (
-            Pyro4HooksCallbackDaemon()
-            if protocol == 'pyro4'
-            else HttpHooksCallbackDaemon())
+        if protocol == 'pyro4':
+            callback_daemon = Pyro4HooksCallbackDaemon()
+        elif protocol == 'http':
+            callback_daemon = HttpHooksCallbackDaemon()
+        else:
+            log.error('Unsupported callback daemon protocol "%s"', protocol)
+            raise Exception('Unsupported callback daemon protocol.')
+
         extras['hooks_uri'] = callback_daemon.hooks_uri
         extras['hooks_protocol'] = protocol
 
@@ -236,6 +245,8 b' class Hooks(object):'
 
     def _call_hook(self, hook, extras):
         extras = AttributeDict(extras)
+        pylons_router = get_routes_generator_for_server_url(extras.server_url)
+        pylons.url._push_object(pylons_router)
 
         try:
             result = hook(extras)
@@ -248,6 +259,9 b' class Hooks(object):'
                 'exception': type(error).__name__,
                 'exception_args': error_args,
             }
+        finally:
+            pylons.url._pop_object()
+
         return {
             'status': result.status,
             'output': result.output,

rhodecode/lib/hooks_utils.py

@@ -21,6 +21,7 b''
 import pylons
 import webob
 
+from rhodecode import events
 from rhodecode.lib import hooks_base
 from rhodecode.lib import utils2
 
@@ -76,6 +77,7 b' def trigger_log_create_pull_request_hook'
 
     extras = _get_rc_scm_extras(username, repo_name, repo_alias,
                                 'create_pull_request')
+    events.trigger(events.PullRequestCreateEvent(pull_request))
     extras.update(pull_request.get_api_data())
     hooks_base.log_create_pull_request(**extras)
 
@@ -95,6 +97,7 b' def trigger_log_merge_pull_request_hook('
 
     extras = _get_rc_scm_extras(username, repo_name, repo_alias,
                                 'merge_pull_request')
+    events.trigger(events.PullRequestMergeEvent(pull_request))
     extras.update(pull_request.get_api_data())
     hooks_base.log_merge_pull_request(**extras)
 
@@ -114,6 +117,7 b' def trigger_log_close_pull_request_hook('
 
     extras = _get_rc_scm_extras(username, repo_name, repo_alias,
                                 'close_pull_request')
+    events.trigger(events.PullRequestCloseEvent(pull_request))
     extras.update(pull_request.get_api_data())
     hooks_base.log_close_pull_request(**extras)
 
@@ -133,6 +137,7 b' def trigger_log_review_pull_request_hook'
 
     extras = _get_rc_scm_extras(username, repo_name, repo_alias,
                                 'review_pull_request')
+    events.trigger(events.PullRequestReviewEvent(pull_request))
     extras.update(pull_request.get_api_data())
     hooks_base.log_review_pull_request(**extras)
 
@@ -152,5 +157,6 b' def trigger_log_update_pull_request_hook'
 
     extras = _get_rc_scm_extras(username, repo_name, repo_alias,
                                 'update_pull_request')
+    events.trigger(events.PullRequestUpdateEvent(pull_request))
     extras.update(pull_request.get_api_data())
     hooks_base.log_update_pull_request(**extras)

rhodecode/lib/index/whoosh_fallback_schema.py

@@ -49,9 +49,9 b' FILE_SCHEMA = Schema('
     extension=ID(stored=True),
     commit_id=TEXT(stored=True),
 
-    size=NUMERIC(stored=True),
+    size=NUMERIC(int, 64, signed=False, stored=True),
     mimetype=TEXT(stored=True),
-    lines=NUMERIC(stored=True),
+    lines=NUMERIC(int, 64, signed=False, stored=True),
 )
 
 
@@ -63,7 +63,7 b' COMMIT_SCHEMA = Schema('
     repository_id=NUMERIC(unique=True, stored=True),
     commit_idx=NUMERIC(stored=True, sortable=True),
     commit_idx_sort=ID(),
-    date=NUMERIC(stored=True, sortable=True),
+    date=NUMERIC(int, 64, signed=False, stored=True, sortable=True),
     owner=TEXT(stored=True),
     author=TEXT(stored=True),
     message=FieldType(format=Characters(), analyzer=ANALYZER,

rhodecode/lib/markdown_ext.py

@@ -22,6 +22,8 b' import re'
 
 import markdown
 
+from mdx_gfm import GithubFlavoredMarkdownExtension  # noqa
+
 
 class FlavoredCheckboxExtension(markdown.Extension):
 
@@ -65,8 +67,6 b' class FlavoredCheckboxPostprocessor(mark'
         return html.replace(before, after)
 
 
-
-
 # Global Vars
 URLIZE_RE = '(%s)' % '|'.join([
     r'<(?:f|ht)tps?://[^>]*>',
@@ -75,6 +75,7 b" URLIZE_RE = '(%s)' % '|'.join(["
     r'[^(<\s]+\.(?:com|net|org)\b',
 ])
 
+
 class UrlizePattern(markdown.inlinepatterns.Pattern):
     """ Return a link Element given an autolink (`http://example/com`). """
     def handleMatch(self, m):

rhodecode/lib/markup_renderer.py

@@ -23,17 +23,19 b''
 Renderer for markup languages with ability to parse using rst or markdown
 """
 
-
 import re
 import os
 import logging
+import itertools
+
 from mako.lookup import TemplateLookup
 
 from docutils.core import publish_parts
 from docutils.parsers.rst import directives
 import markdown
 
-from rhodecode.lib.markdown_ext import FlavoredCheckboxExtension, UrlizeExtension
+from rhodecode.lib.markdown_ext import (
+    UrlizeExtension, GithubFlavoredMarkdownExtension)
 from rhodecode.lib.utils2 import safe_unicode, md5_safe, MENTIONS_REGEX
 
 log = logging.getLogger(__name__)
@@ -49,6 +51,37 b' class MarkupRenderer(object):'
     RST_PAT = re.compile(r'\.re?st$', re.IGNORECASE)
     PLAIN_PAT = re.compile(r'^readme$', re.IGNORECASE)
 
+    # list of readme files to search in file tree and display in summary
+    # attached weights defines the search  order lower is first
+    ALL_READMES = [
+        ('readme', 0), ('README', 0), ('Readme', 0),
+        ('doc/readme', 1), ('doc/README', 1), ('doc/Readme', 1),
+        ('Docs/readme', 2), ('Docs/README', 2), ('Docs/Readme', 2),
+        ('DOCS/readme', 2), ('DOCS/README', 2), ('DOCS/Readme', 2),
+        ('docs/readme', 2), ('docs/README', 2), ('docs/Readme', 2),
+    ]
+    # extension together with weights. Lower is first means we control how
+    # extensions are attached to readme names with those.
+    PLAIN_EXTS = [
+        ('', 0),  # special case that renders READMES names without extension
+        ('.text', 2), ('.TEXT', 2),
+        ('.txt', 3), ('.TXT', 3)
+    ]
+
+    RST_EXTS = [
+        ('.rst', 1), ('.rest', 1),
+        ('.RST', 2), ('.REST', 2)
+    ]
+
+    MARKDOWN_EXTS = [
+        ('.md', 1), ('.MD', 1),
+        ('.mkdn', 2), ('.MKDN', 2),
+        ('.mdown', 3), ('.MDOWN', 3),
+        ('.markdown', 4), ('.MARKDOWN', 4)
+    ]
+
+    ALL_EXTS = PLAIN_EXTS + MARKDOWN_EXTS + RST_EXTS
+
     def _detect_renderer(self, source, filename=None):
         """
         runs detection of what renderer should be used for generating html
@@ -71,6 +104,49 b' class MarkupRenderer(object):'
 
         return getattr(MarkupRenderer, detected_renderer)
 
+    @classmethod
+    def renderer_from_filename(cls, filename, exclude):
+        """
+        Detect renderer markdown/rst from filename and optionally use exclude
+        list to remove some options. This is mostly used in helpers.
+        Returns None when no renderer can be detected.
+        """
+        def _filter(elements):
+            if isinstance(exclude, (list, tuple)):
+                return [x for x in elements if x not in exclude]
+            return elements
+
+        if filename.endswith(
+                tuple(_filter([x[0] for x in cls.MARKDOWN_EXTS if x[0]]))):
+            return 'markdown'
+        if filename.endswith(tuple(_filter([x[0] for x in cls.RST_EXTS if x[0]]))):
+            return 'rst'
+
+        return None
+
+    @classmethod
+    def generate_readmes(cls, all_readmes, extensions):
+        combined = itertools.product(all_readmes, extensions)
+        # sort by filename weight(y[0][1]) + extensions weight(y[1][1])
+        prioritized_readmes = sorted(combined, key=lambda y: y[0][1] + y[1][1])
+        # filename, extension
+        return [''.join([x[0][0], x[1][0]]) for x in prioritized_readmes]
+
+    def pick_readme_order(self, default_renderer):
+
+        if default_renderer == 'markdown':
+            markdown = self.generate_readmes(self.ALL_READMES, self.MARKDOWN_EXTS)
+            readme_order = markdown + self.generate_readmes(
+                self.ALL_READMES, self.RST_EXTS + self.PLAIN_EXTS)
+        elif default_renderer == 'rst':
+            markdown = self.generate_readmes(self.ALL_READMES, self.RST_EXTS)
+            readme_order = markdown + self.generate_readmes(
+                self.ALL_READMES, self.MARKDOWN_EXTS + self.PLAIN_EXTS)
+        else:
+            readme_order = self.generate_readmes(self.ALL_READMES, self.ALL_EXTS)
+
+        return readme_order
+
     def render(self, source, filename=None):
         """
         Renders a given filename using detected renderer
@@ -141,15 +217,13 b' class MarkupRenderer(object):'
         return '<br />' + source.replace("\n", '<br />')
 
     @classmethod
-    def markdown(cls, source, safe=True, flavored=False, mentions=False):
+    def markdown(cls, source, safe=True, flavored=True, mentions=False):
         # It does not allow to insert inline HTML. In presence of HTML tags, it
         # will replace them instead with [HTML_REMOVED]. This is controlled by
         # the safe_mode=True parameter of the markdown method.
         extensions = ['codehilite', 'extra', 'def_list', 'sane_lists']
         if flavored:
-            extensions.append('nl2br')
-            extensions.append(FlavoredCheckboxExtension())
-            extensions.append(UrlizeExtension())
+            extensions.append(GithubFlavoredMarkdownExtension())
 
         if mentions:
             mention_pat = re.compile(MENTIONS_REGEX)
@@ -171,7 +245,7 b' class MarkupRenderer(object):'
         except Exception:
             log.exception('Error when rendering Markdown')
             if safe:
-                log.debug('Fallbacking to render in plain mode')
+                log.debug('Fallback to render in plain mode')
                 return cls.plain(source)
             else:
                 raise
@@ -190,8 +264,9 b' class MarkupRenderer(object):'
 
         source = safe_unicode(source)
         try:
-            docutils_settings = dict([(alias, None) for alias in
-                                cls.RESTRUCTUREDTEXT_DISALLOWED_DIRECTIVES])
+            docutils_settings = dict(
+                [(alias, None) for alias in
+                 cls.RESTRUCTUREDTEXT_DISALLOWED_DIRECTIVES])
 
             docutils_settings.update({'input_encoding': 'unicode',
                                       'report_level': 4})

rhodecode/lib/middleware/appenlight.py

@@ -25,7 +25,6 b' middleware to handle appenlight publishi'
 from appenlight_client import make_appenlight_middleware
 from appenlight_client.exceptions import get_current_traceback
 from appenlight_client.wsgi import AppenlightWSGIWrapper
-from paste.deploy.converters import asbool
 
 
 def track_exception(environ):
@@ -50,7 +49,7 b' def track_extra_information(environ, sec'
     environ['appenlight.extra'][section] = value
 
 
-def wrap_in_appenlight_if_enabled(app, config, appenlight_client=None):
+def wrap_in_appenlight_if_enabled(app, settings, appenlight_client=None):
     """
     Wraps the given `app` for appenlight support.
 
@@ -64,10 +63,10 b' def wrap_in_appenlight_if_enabled(app, c'
        This is in use to support our setup of the vcs related middlewares.
 
     """
-    if asbool(config['app_conf'].get('appenlight')):
+    if settings['appenlight']:
         app = RemoteTracebackTracker(app)
         if not appenlight_client:
-            app = make_appenlight_middleware(app, config)
+            app = make_appenlight_middleware(app, settings)
             appenlight_client = app.appenlight_client
         else:
             app = AppenlightWSGIWrapper(app, appenlight_client)

rhodecode/lib/middleware/simplesvn.py

@@ -30,7 +30,7 b' from rhodecode.lib.utils import is_valid'
 class SimpleSvnApp(object):
     IGNORED_HEADERS = [
         'connection', 'keep-alive', 'content-encoding',
-        'transfer-encoding']
+        'transfer-encoding', 'content-length']
 
     def __init__(self, config):
         self.config = config
@@ -79,12 +79,18 b' class SimpleSvnApp(object):'
         return headers
 
     def _get_response_headers(self, headers):
-        return [
+        headers = [
             (h, headers[h])
             for h in headers
             if h.lower() not in self.IGNORED_HEADERS
         ]
 
+        # Add custom response header to indicate that this is a VCS response
+        # and which backend is used.
+        headers.append(('X-RhodeCode-Backend', 'svn'))
+
+        return headers
+
 
 class SimpleSvn(simplevcs.SimpleVCS):
 

rhodecode/lib/middleware/simplevcs.py

@@ -42,8 +42,10 b' from rhodecode.lib.exceptions import ('
 from rhodecode.lib.hooks_daemon import prepare_callback_daemon
 from rhodecode.lib.middleware import appenlight
 from rhodecode.lib.middleware.utils import scm_app
-from rhodecode.lib.utils import is_valid_repo
+from rhodecode.lib.utils import (
+    is_valid_repo, get_rhodecode_realm, get_rhodecode_base_path)
 from rhodecode.lib.utils2 import safe_str, fix_PATH, str2bool
+from rhodecode.lib.vcs.conf import settings as vcs_settings
 from rhodecode.model import meta
 from rhodecode.model.db import User, Repository
 from rhodecode.model.scm import ScmModel
@@ -80,23 +82,24 b' class SimpleVCS(object):'
 
     SCM = 'unknown'
 
-    def __init__(self, application, config):
+    def __init__(self, application, config, registry):
+        self.registry = registry
         self.application = application
         self.config = config
         # base path of repo locations
-        self.basepath = self.config['base_path']
+        self.basepath = get_rhodecode_base_path()
         # authenticate this VCS request using authfunc
         auth_ret_code_detection = \
             str2bool(self.config.get('auth_ret_code_detection', False))
-        self.authenticate = BasicAuth('', authenticate,
-                                      config.get('auth_ret_code'),
-                                      auth_ret_code_detection)
+        self.authenticate = BasicAuth(
+            '', authenticate, registry, config.get('auth_ret_code'),
+            auth_ret_code_detection)
         self.ip_addr = '0.0.0.0'
 
     @property
     def scm_app(self):
         custom_implementation = self.config.get('vcs.scm_app_implementation')
-        if custom_implementation:
+        if custom_implementation and custom_implementation != 'pyro4':
             log.info(
                 "Using custom implementation of scm_app: %s",
                 custom_implementation)
@@ -282,15 +285,15 b' class SimpleVCS(object):'
 
                 # try to auth based on environ, container auth methods
                 log.debug('Running PRE-AUTH for container based authentication')
-                pre_auth = authenticate('', '', environ,VCS_TYPE)
+                pre_auth = authenticate(
+                    '', '', environ, VCS_TYPE, registry=self.registry)
                 if pre_auth and pre_auth.get('username'):
                     username = pre_auth['username']
                 log.debug('PRE-AUTH got %s as username', username)
 
                 # If not authenticated by the container, running basic auth
                 if not username:
-                    self.authenticate.realm = \
-                        safe_str(self.config['rhodecode_realm'])
+                    self.authenticate.realm = get_rhodecode_realm()
 
                     try:
                         result = self.authenticate(environ)
@@ -349,6 +352,7 b' class SimpleVCS(object):'
         log.info(
             '%s action on %s repo "%s" by "%s" from %s',
             action, self.SCM, str_repo_name, safe_str(username), ip_addr)
+
         return self._generate_vcs_response(
             environ, start_response, repo_path, repo_name, extras, action)
 
@@ -429,8 +433,8 b' class SimpleVCS(object):'
 
     def _prepare_callback_daemon(self, extras):
         return prepare_callback_daemon(
-            extras, protocol=self.config.get('vcs.hooks.protocol'),
-            use_direct_calls=self.config.get('vcs.hooks.direct_calls'))
+            extras, protocol=vcs_settings.HOOKS_PROTOCOL,
+            use_direct_calls=vcs_settings.HOOKS_DIRECT_CALLS)
 
 
 def _should_check_locking(query_string):

rhodecode/lib/middleware/utils/scm_app_http.py

@@ -39,12 +39,12 b' log = logging.getLogger(__name__)'
 
 def create_git_wsgi_app(repo_path, repo_name, config):
     url = _vcs_streaming_url() + 'git/'
-    return VcsHttpProxy(url, repo_path, repo_name, config)
+    return VcsHttpProxy(url, repo_path, repo_name, config, 'git')
 
 
 def create_hg_wsgi_app(repo_path, repo_name, config):
     url = _vcs_streaming_url() + 'hg/'
-    return VcsHttpProxy(url, repo_path, repo_name, config)
+    return VcsHttpProxy(url, repo_path, repo_name, config, 'hg')
 
 
 def _vcs_streaming_url():
@@ -67,7 +67,7 b' class VcsHttpProxy(object):'
     server as well.
     """
 
-    def __init__(self, url, repo_path, repo_name, config):
+    def __init__(self, url, repo_path, repo_name, config, backend):
         """
         :param str url: The URL of the VCSServer to call.
         """
@@ -75,6 +75,7 b' class VcsHttpProxy(object):'
         self._repo_name = repo_name
         self._repo_path = repo_path
         self._config = config
+        self._backend = backend
         log.debug(
             "Creating VcsHttpProxy for repo %s, url %s",
             repo_name, url)
@@ -115,6 +116,10 b' class VcsHttpProxy(object):'
             if not wsgiref.util.is_hop_by_hop(h)
         ]
 
+        # Add custom response header to indicate that this is a VCS response
+        # and which backend is used.
+        response_headers.append(('X-RhodeCode-Backend', self._backend))
+
         # TODO: johbo: Better way to get the status including text?
         status = str(response.status_code)
         start_response(status, response_headers)

rhodecode/lib/middleware/vcs.py

@@ -72,7 +72,11 b' def is_svn(environ):'
     Returns True if requests target is Subversion server
     """
     http_dav = environ.get('HTTP_DAV', '')
-    is_svn_path = 'subversion' in http_dav
+    magic_path_segment = rhodecode.CONFIG.get(
+        'rhodecode_subversion_magic_path', '/!svn')
+    is_svn_path = (
+        'subversion' in http_dav or
+        magic_path_segment in environ['PATH_INFO'])
     log.debug(
         'request path: `%s` detected as SVN PROTOCOL %s', environ['PATH_INFO'],
         is_svn_path)
@@ -122,23 +126,24 b' class GunzipMiddleware(object):'
 
 class VCSMiddleware(object):
 
-    def __init__(self, app, config, appenlight_client):
+    def __init__(self, app, config, appenlight_client, registry):
         self.application = app
         self.config = config
         self.appenlight_client = appenlight_client
+        self.registry = registry
 
     def _get_handler_app(self, environ):
         app = None
         if is_hg(environ):
-            app = SimpleHg(self.application, self.config)
+            app = SimpleHg(self.application, self.config, self.registry)
 
         if is_git(environ):
-            app = SimpleGit(self.application, self.config)
+            app = SimpleGit(self.application, self.config, self.registry)
 
         proxy_svn = rhodecode.CONFIG.get(
             'rhodecode_proxy_subversion_http_requests', False)
         if proxy_svn and is_svn(environ):
-            app = SimpleSvn(self.application, self.config)
+            app = SimpleSvn(self.application, self.config, self.registry)
 
         if app:
             app = GunzipMiddleware(app)

rhodecode/lib/paster_commands/make_config.py

@@ -19,7 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
-depracated make-config paster command for RhodeCode
+deprecated make-config paster command for RhodeCode
 """
 
 import os

rhodecode/lib/plugins/utils.py

@@ -23,8 +23,6 b' def get_plugin_settings(prefix, settings'
     """
     Returns plugin settings. Use::
 
-
-
     :param prefix:
     :param settings:
     :return:
@@ -45,21 +43,15 b' def register_rhodecode_plugin(config, pl'
                 'javascript': None,
                 'static': None,
                 'css': None,
-                'top_nav': None,
+                'nav': None,
                 'fulltext_indexer': None,
                 'sqlalchemy_migrations': None,
                 'default_values_setter': None,
-                'resource_types': [],
-                'url_gen': None
+                'url_gen': None,
+                'template_hooks': {}
             }
         config.registry.rhodecode_plugins[plugin_name].update(
             plugin_config)
-        # inform RC what kind of resource types we have available
-        # so we can avoid failing when a plugin is removed but data
-        # is still present in the db
-        if plugin_config.get('resource_types'):
-            config.registry.resource_types.extend(
-                plugin_config['resource_types'])
 
     config.action(
         'register_rhodecode_plugin={}'.format(plugin_name), register)

rhodecode/lib/utils.py

@@ -352,17 +352,17 b' def is_valid_repo_group(repo_group_name,'
     return False
 
 
-def ask_ok(prompt, retries=4, complaint='Yes or no please!'):
+def ask_ok(prompt, retries=4, complaint='[y]es or [n]o please!'):
     while True:
         ok = raw_input(prompt)
-        if ok in ('y', 'ye', 'yes'):
+        if ok.lower() in ('y', 'ye', 'yes'):
             return True
-        if ok in ('n', 'no', 'nop', 'nope'):
+        if ok.lower() in ('n', 'no', 'nop', 'nope'):
             return False
         retries = retries - 1
         if retries < 0:
             raise IOError
-        print complaint
+        print(complaint)
 
 # propagated from mercurial documentation
 ui_sections = [
@@ -475,6 +475,25 b' def set_rhodecode_config(config):'
         config[k] = v
 
 
+def get_rhodecode_realm():
+    """
+    Return the rhodecode realm from database.
+    """
+    from rhodecode.model.settings import SettingsModel
+    realm = SettingsModel().get_setting_by_name('realm')
+    return safe_str(realm.app_settings_value)
+
+
+def get_rhodecode_base_path():
+    """
+    Returns the base path. The base path is the filesystem path which points
+    to the repository store.
+    """
+    from rhodecode.model.settings import SettingsModel
+    paths_ui = SettingsModel().get_ui_by_section_and_key('paths', '/')
+    return safe_str(paths_ui.ui_value)
+
+
 def map_groups(path):
     """
     Given a full path to a repository, create all nested groups that this
@@ -958,8 +977,10 b' class PartialRenderer(object):'
 
 
 def password_changed(auth_user, session):
-    if auth_user.username == User.DEFAULT_USER:
+    # Never report password change in case of default user or anonymous user.
+    if auth_user.username == User.DEFAULT_USER or auth_user.user_id is None:
         return False
+
     password_hash = md5(auth_user.password) if auth_user.password else None
     rhodecode_user = session.get('rhodecode_user', {})
     session_password_hash = rhodecode_user.get('password', '')

rhodecode/lib/utils2.py

@@ -41,6 +41,7 b' import pygments.lexers'
 import sqlalchemy
 import sqlalchemy.engine.url
 import webob
+import routes.util
 
 import rhodecode
 
@@ -858,3 +859,28 b' class Optional(object):'
         if isinstance(val, cls):
             return val.getval()
         return val
+
+
+def get_routes_generator_for_server_url(server_url):
+    parsed_url = urlobject.URLObject(server_url)
+    netloc = safe_str(parsed_url.netloc)
+    script_name = safe_str(parsed_url.path)
+
+    if ':' in netloc:
+        server_name, server_port = netloc.split(':')
+    else:
+        server_name = netloc
+        server_port = (parsed_url.scheme == 'https' and '443' or '80')
+
+    environ = {
+        'REQUEST_METHOD': 'GET',
+        'PATH_INFO': '/',
+        'SERVER_NAME': server_name,
+        'SERVER_PORT': server_port,
+        'SCRIPT_NAME': script_name,
+    }
+    if parsed_url.scheme == 'https':
+        environ['HTTPS'] = 'on'
+        environ['wsgi.url_scheme'] = 'https'
+
+    return routes.util.URLGenerator(rhodecode.CONFIG['routes.map'], environ)

rhodecode/lib/vcs/__init__.py

@@ -29,7 +29,7 b" VERSION = (0, 5, 0, 'dev')"
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
 
 __all__ = [
-    'get_version', 'get_repo', 'get_backend',
+    'get_version', 'get_vcs_instance', 'get_backend',
     'VCSError', 'RepositoryError', 'CommitError'
     ]
 
@@ -40,17 +40,29 b' import time'
 import urlparse
 from cStringIO import StringIO
 
-import pycurl
 import Pyro4
 from Pyro4.errors import CommunicationError
 
 from rhodecode.lib.vcs.conf import settings
-from rhodecode.lib.vcs.backends import get_repo, get_backend
+from rhodecode.lib.vcs.backends import get_vcs_instance, get_backend
 from rhodecode.lib.vcs.exceptions import (
     VCSError, RepositoryError, CommitError)
 
+log = logging.getLogger(__name__)
 
-log = logging.getLogger(__name__)
+# The pycurl library directly accesses C API functions and is not patched by
+# gevent. This will potentially lead to deadlocks due to incompatibility to
+# gevent. Therefore we check if gevent is active and import a gevent compatible
+# wrapper in that case.
+try:
+    from gevent import monkey
+    if monkey.is_module_patched('__builtin__'):
+        import geventcurl as pycurl
+        log.debug('Using gevent comapatible pycurl: %s', pycurl)
+    else:
+        import pycurl
+except ImportError:
+    import pycurl
 
 
 def get_version():
@@ -64,11 +76,11 b' def connect_pyro4(server_and_port):'
     from rhodecode.lib.vcs import connection, client
     from rhodecode.lib.middleware.utils import scm_app
 
-    git_remote = client.ThreadlocalProxyFactory(
+    git_remote = client.RequestScopeProxyFactory(
         settings.pyro_remote(settings.PYRO_GIT, server_and_port))
-    hg_remote = client.ThreadlocalProxyFactory(
+    hg_remote = client.RequestScopeProxyFactory(
         settings.pyro_remote(settings.PYRO_HG, server_and_port))
-    svn_remote = client.ThreadlocalProxyFactory(
+    svn_remote = client.RequestScopeProxyFactory(
         settings.pyro_remote(settings.PYRO_SVN, server_and_port))
 
     connection.Git = client.RepoMaker(proxy_factory=git_remote)

rhodecode/lib/vcs/backends/__init__.py

@@ -22,7 +22,8 b''
 VCS Backends module
 """
 
-import os
+import logging
+
 from pprint import pformat
 
 from rhodecode.lib.vcs.conf import settings
@@ -31,31 +32,29 b' from rhodecode.lib.vcs.utils.helpers imp'
 from rhodecode.lib.vcs.utils.imports import import_class
 
 
-def get_repo(path=None, alias=None, create=False):
+log = logging.getLogger(__name__)
+
+
+def get_vcs_instance(repo_path, *args, **kwargs):
     """
-    Returns ``Repository`` object of type linked with given ``alias`` at
-    the specified ``path``. If ``alias`` is not given it will try to guess it
-    using get_scm method
+    Given a path to a repository an instance of the corresponding vcs backend
+    repository class is created and returned. If no repository can be found
+    for the path it returns None. Arguments and keyword arguments are passed
+    to the vcs backend repository class.
     """
-    if create:
-        if not (path or alias):
-            raise TypeError(
-                "If create is specified, we need path and scm type")
-        return get_backend(alias)(path, create=True)
-    if path is None:
-        path = os.path.abspath(os.path.curdir)
     try:
-        scm, path = get_scm(path, search_path_up=True)
-        path = os.path.abspath(path)
-        alias = scm
+        vcs_alias = get_scm(repo_path)[0]
+        log.debug(
+            'Creating instance of %s repository from %s', vcs_alias, repo_path)
+        backend = get_backend(vcs_alias)
     except VCSError:
-        raise VCSError("No scm found at %s" % path)
-    if alias is None:
-        alias = get_scm(path)[0]
+        log.exception(
+            'Perhaps this repository is in db and not in '
+            'filesystem run rescan repositories with '
+            '"destroy old data" option from admin panel')
+        return None
 
-    backend = get_backend(alias)
-    repo = backend(path, create=create)
-    return repo
+    return backend(repo_path=repo_path, *args, **kwargs)
 
 
 def get_backend(alias):

rhodecode/lib/vcs/backends/base.py

@@ -365,7 +365,8 b' class BaseRepository(object):'
         raise NotImplementedError
 
     def merge(self, target_ref, source_repo, source_ref, workspace_id,
-              user_name='', user_email='', message='', dry_run=False):
+              user_name='', user_email='', message='', dry_run=False,
+              use_rebase=False):
         """
         Merge the revisions specified in `source_ref` from `source_repo`
         onto the `target_ref` of this repository.
@@ -388,6 +389,8 b' class BaseRepository(object):'
         :param user_email: Merge commit `user_email`.
         :param message: Merge commit `message`.
         :param dry_run: If `True` the merge will not take place.
+        :param use_rebase: If `True` commits from the source will be rebased
+            on top of the target instead of being merged.
         """
         if dry_run:
             message = message or 'sample_message'
@@ -407,7 +410,8 b' class BaseRepository(object):'
         try:
             return self._merge_repo(
                 shadow_repository_path, target_ref, source_repo,
-                source_ref, message, user_name, user_email, dry_run=dry_run)
+                source_ref, message, user_name, user_email, dry_run=dry_run,
+                use_rebase=use_rebase)
         except RepositoryError:
             log.exception(
                 'Unexpected failure when running merge, dry-run=%s',
@@ -864,7 +868,7 b' class BaseCommit(object):'
             for f in files:
                 f_path = os.path.join(prefix, f.path)
                 file_info.append(
-                    (f_path, f.mode, f.is_link(), f._get_content()))
+                    (f_path, f.mode, f.is_link(), f.raw_bytes))
 
         if write_metadata:
             metadata = [
@@ -1328,6 +1332,10 b' class EmptyCommit(BaseCommit):'
     def short_id(self):
         return self.raw_id[:12]
 
+    @LazyProperty
+    def id(self):
+        return self.raw_id
+
     def get_file_commit(self, path):
         return self
 

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

@@ -833,7 +833,8 b' class GitRepository(BaseRepository):'
 
     def _merge_repo(self, shadow_repository_path, target_ref,
                     source_repo, source_ref, merge_message,
-                    merger_name, merger_email, dry_run=False):
+                    merger_name, merger_email, dry_run=False,
+                    use_rebase=False):
         if target_ref.commit_id != self.branches[target_ref.name]:
             return MergeResponse(
                 False, False, None, MergeFailureReason.TARGET_IS_NOT_HEAD)

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

@@ -25,15 +25,15 b' HG repository module'
 import logging
 import binascii
 import os
-import re
 import shutil
 import urllib
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
 from rhodecode.lib.compat import OrderedDict
-from rhodecode.lib.datelib import (date_to_timestamp_plus_offset,
-    utcdate_fromtimestamp, makedate, date_astimestamp)
+from rhodecode.lib.datelib import (
+    date_to_timestamp_plus_offset, utcdate_fromtimestamp, makedate,
+    date_astimestamp)
 from rhodecode.lib.utils import safe_unicode, safe_str
 from rhodecode.lib.vcs import connection
 from rhodecode.lib.vcs.backends.base import (
@@ -42,7 +42,6 b' from rhodecode.lib.vcs.backends.base imp'
 from rhodecode.lib.vcs.backends.hg.commit import MercurialCommit
 from rhodecode.lib.vcs.backends.hg.diff import MercurialDiff
 from rhodecode.lib.vcs.backends.hg.inmemory import MercurialInMemoryCommit
-from rhodecode.lib.vcs.conf import settings
 from rhodecode.lib.vcs.exceptions import (
     EmptyRepositoryError, RepositoryError, TagAlreadyExistError,
     TagDoesNotExistError, CommitDoesNotExistError)
@@ -176,6 +175,7 b' class MercurialRepository(BaseRepository'
 
         self._remote.tag(
             name, commit.raw_id, message, local, user, date, tz)
+        self._remote.invalidate_vcs_cache()
 
         # Reinitialize tags
         self.tags = self._get_tags()
@@ -203,6 +203,7 b' class MercurialRepository(BaseRepository'
         date, tz = date_to_timestamp_plus_offset(date)
 
         self._remote.tag(name, nullid, message, local, user, date, tz)
+        self._remote.invalidate_vcs_cache()
         self.tags = self._get_tags()
 
     @LazyProperty
@@ -262,6 +263,7 b' class MercurialRepository(BaseRepository'
     def strip(self, commit_id, branch=None):
         self._remote.strip(commit_id, update=False, backup="none")
 
+        self._remote.invalidate_vcs_cache()
         self.commit_ids = self._get_all_commit_ids()
         self._rebuild_cache(self.commit_ids)
 
@@ -531,6 +533,7 b' class MercurialRepository(BaseRepository'
         """
         url = self._get_url(url)
         self._remote.pull(url, commit_ids=commit_ids)
+        self._remote.invalidate_vcs_cache()
 
     def _local_clone(self, clone_path):
         """
@@ -577,7 +580,7 b' class MercurialRepository(BaseRepository'
             push_branches=push_branches)
 
     def _local_merge(self, target_ref, merge_message, user_name, user_email,
-                     source_ref):
+                     source_ref, use_rebase=False):
         """
         Merge the given source_revision into the checked out revision.
 
@@ -597,13 +600,14 b' class MercurialRepository(BaseRepository'
             # In this case we should force a commit message
             return source_ref.commit_id, True
 
-        if settings.HG_USE_REBASE_FOR_MERGING:
+        if use_rebase:
             try:
                 bookmark_name = 'rcbook%s%s' % (source_ref.commit_id,
                                                 target_ref.commit_id)
                 self.bookmark(bookmark_name, revision=source_ref.commit_id)
                 self._remote.rebase(
                     source=source_ref.commit_id, dest=target_ref.commit_id)
+                self._remote.invalidate_vcs_cache()
                 self._update(bookmark_name)
                 return self._identify(), True
             except RepositoryError:
@@ -612,15 +616,19 b' class MercurialRepository(BaseRepository'
                 log.exception('Error while rebasing shadow repo during merge.')
 
                 # Cleanup any rebase leftovers
+                self._remote.invalidate_vcs_cache()
                 self._remote.rebase(abort=True)
+                self._remote.invalidate_vcs_cache()
                 self._remote.update(clean=True)
                 raise
         else:
             try:
                 self._remote.merge(source_ref.commit_id)
+                self._remote.invalidate_vcs_cache()
                 self._remote.commit(
                     message=safe_str(merge_message),
                     username=safe_str('%s <%s>' % (user_name, user_email)))
+                self._remote.invalidate_vcs_cache()
                 return self._identify(), True
             except RepositoryError:
                 # Cleanup any merge leftovers
@@ -659,7 +667,8 b' class MercurialRepository(BaseRepository'
 
     def _merge_repo(self, shadow_repository_path, target_ref,
                     source_repo, source_ref, merge_message,
-                    merger_name, merger_email, dry_run=False):
+                    merger_name, merger_email, dry_run=False,
+                    use_rebase=False):
         if target_ref.commit_id not in self._heads():
             return MergeResponse(
                 False, False, None, MergeFailureReason.TARGET_IS_NOT_HEAD)
@@ -690,7 +699,7 b' class MercurialRepository(BaseRepository'
         try:
             merge_commit_id, needs_push = shadow_repo._local_merge(
                 target_ref, merge_message, merger_name, merger_email,
-                source_ref)
+                source_ref, use_rebase=use_rebase)
             merge_possible = True
         except RepositoryError as e:
             log.exception('Failure when doing local merge on hg shadow repo')
@@ -771,11 +780,13 b' class MercurialRepository(BaseRepository'
 
         options = {option_name: [ref]}
         self._remote.pull_cmd(repository_path, hooks=False, **options)
+        self._remote.invalidate_vcs_cache()
 
     def bookmark(self, bookmark, revision=None):
         if isinstance(bookmark, unicode):
             bookmark = safe_str(bookmark)
         self._remote.bookmark(bookmark, revision=revision)
+        self._remote.invalidate_vcs_cache()
 
 
 class MercurialIndexBasedCollectionGenerator(CollectionGenerator):

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

@@ -203,6 +203,10 b' class SubversionCommit(base.BaseCommit):'
             changed_files.update(files)
         return list(changed_files)
 
+    @LazyProperty
+    def id(self):
+        return self.raw_id
+
     @property
     def added(self):
         return nodes.AddedFileNodesGenerator(

rhodecode/lib/vcs/client.py

@@ -34,6 +34,7 b' from urllib2 import URLError'
 import msgpack
 import Pyro4
 import requests
+from pyramid.threadlocal import get_current_request
 from Pyro4.errors import CommunicationError, ConnectionClosedError, DaemonError
 
 from rhodecode.lib.vcs import exceptions
@@ -190,19 +191,67 b' class RepoMaker(object):'
         return _wrap_remote_call(remote_proxy, func)
 
 
-class ThreadlocalProxyFactory(object):
+class RequestScopeProxyFactory(object):
     """
-    Creates one Pyro4 proxy per thread on demand.
+    This factory returns pyro proxy instances based on a per request scope.
+    It returns the same instance if called from within the same request and
+    different instances if called from different requests.
     """
 
     def __init__(self, remote_uri):
         self._remote_uri = remote_uri
-        self._thread_local = threading.local()
+        self._proxy_pool = []
+        self._borrowed_proxies = {}
+
+    def __call__(self, request=None):
+        """
+        Wrapper around `getProxy`.
+        """
+        request = request or get_current_request()
+        return self.getProxy(request)
+
+    def getProxy(self, request):
+        """
+        Call this to get the pyro proxy instance for the request.
+        """
+
+        # If called without a request context we return new proxy instances
+        # on every call. This allows to run e.g. invoke tasks.
+        if request is None:
+            log.info('Creating pyro proxy without request context for '
+                     'remote_uri=%s', self._remote_uri)
+            return Pyro4.Proxy(self._remote_uri)
 
-    def __call__(self):
-        if not hasattr(self._thread_local, 'proxy'):
-            self._thread_local.proxy = Pyro4.Proxy(self._remote_uri)
-        return self._thread_local.proxy
+        # If there is an already borrowed proxy for the request context we
+        # return that instance instead of creating a new one.
+        if request in self._borrowed_proxies:
+            return self._borrowed_proxies[request]
+
+        # Get proxy from pool or create new instance.
+        try:
+            proxy = self._proxy_pool.pop()
+        except IndexError:
+            log.info('Creating pyro proxy for remote_uri=%s', self._remote_uri)
+            proxy = Pyro4.Proxy(self._remote_uri)
+
+        # Mark proxy as borrowed for the request context and add a callback
+        # that returns it when the request processing is finished.
+        self._borrowed_proxies[request] = proxy
+        request.add_finished_callback(self._returnProxy)
+
+        return proxy
+
+    def _returnProxy(self, request):
+        """
+        Callback that gets called by pyramid when the request is finished.
+        It puts the proxy back into the pool.
+        """
+        if request in self._borrowed_proxies:
+            proxy = self._borrowed_proxies.pop(request)
+            self._proxy_pool.append(proxy)
+        else:
+            log.warn('Return proxy for remote_uri=%s but no proxy borrowed '
+                     'for this request.', self._remote_uri)
 
 
 class RemoteRepo(object):
@@ -211,7 +260,7 b' class RemoteRepo(object):'
         self._wire = {
             "path": path,
             "config": config,
-            "context": uuid.uuid4(),
+            "context": self._create_vcs_cache_context(),
         }
         if with_wire:
             self._wire.update(with_wire)
@@ -238,6 +287,19 b' class RemoteRepo(object):'
     def __getitem__(self, key):
         return self.revision(key)
 
+    def _create_vcs_cache_context(self):
+        """
+        Creates a unique string which is passed to the VCSServer on every
+        remote call. It is used as cache key in the VCSServer.
+        """
+        return str(uuid.uuid4())
+
+    def invalidate_vcs_cache(self):
+        """
+        This is a no-op method for the pyro4 backend but we want to have the
+        same API for client.RemoteRepo and client_http.RemoteRepo classes.
+        """
+
 
 def _get_proxy_method(proxy, name):
     try:

rhodecode/lib/vcs/client_http.py

@@ -90,7 +90,7 b' class RemoteRepo(object):'
         self._wire = {
             "path": path,
             "config": config,
-            "context": str(uuid.uuid4()),
+            "context": self._create_vcs_cache_context(),
         }
         if with_wire:
             self._wire.update(with_wire)
@@ -125,6 +125,21 b' class RemoteRepo(object):'
     def __getitem__(self, key):
         return self.revision(key)
 
+    def _create_vcs_cache_context(self):
+        """
+        Creates a unique string which is passed to the VCSServer on every
+        remote call. It is used as cache key in the VCSServer.
+        """
+        return str(uuid.uuid4())
+
+    def invalidate_vcs_cache(self):
+        """
+        This invalidates the context which is sent to the VCSServer on every
+        call to a remote method. It forces the VCSServer to create a fresh
+        repository instance on the next call to a remote method.
+        """
+        self._wire['context'] = self._create_vcs_cache_context()
+
 
 class RemoteObject(object):
 

rhodecode/lib/vcs/conf/settings.py

@@ -29,8 +29,6 b" DEFAULT_ENCODINGS = ['utf8']"
 # It can also be ['--branches', '--tags']
 GIT_REV_FILTER = ['--all']
 
-HG_USE_REBASE_FOR_MERGING = False
-
 # Compatibility version when creating SVN repositories. None means newest.
 # Other available options are: pre-1.4-compatible, pre-1.5-compatible,
 # pre-1.6-compatible, pre-1.8-compatible
@@ -51,6 +49,9 b' ARCHIVE_SPECS = {'
     'zip': ('application/zip', '.zip'),
 }
 
+HOOKS_PROTOCOL = None
+HOOKS_DIRECT_CALLS = False
+
 PYRO_PORT = 9900
 
 PYRO_GIT = 'git_remote'

rhodecode/lib/vcs/nodes.py

@@ -28,6 +28,7 b' import stat'
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
 from rhodecode.lib.utils import safe_unicode, safe_str
+from rhodecode.lib.utils2 import md5
 from rhodecode.lib.vcs import path as vcspath
 from rhodecode.lib.vcs.backends.base import EmptyCommit, FILEMODE_DEFAULT
 from rhodecode.lib.vcs.conf.mtypes import get_mimetypes_db
@@ -318,22 +319,35 b' class FileNode(Node):'
             mode = self._mode
         return mode
 
-    def _get_content(self):
+    @LazyProperty
+    def raw_bytes(self):
+        """
+        Returns lazily the raw bytes of the FileNode.
+        """
         if self.commit:
-            content = self.commit.get_file_content(self.path)
+            if self._content is None:
+                self._content = self.commit.get_file_content(self.path)
+            content = self._content
         else:
             content = self._content
         return content
 
-    @property
+    @LazyProperty
+    def md5(self):
+        """
+        Returns md5 of the file node.
+        """
+        return md5(self.raw_bytes)
+
+    @LazyProperty
     def content(self):
         """
         Returns lazily content of the FileNode. If possible, would try to
         decode content from UTF-8.
         """
-        content = self._get_content()
+        content = self.raw_bytes
 
-        if bool(content and '\0' in content):
+        if self.is_binary:
             return content
         return safe_unicode(content)
 
@@ -467,12 +481,12 b' class FileNode(Node):'
         else:
             return NodeState.NOT_CHANGED
 
-    @property
+    @LazyProperty
     def is_binary(self):
         """
         Returns True if file has binary content.
         """
-        _bin = '\0' in self._get_content()
+        _bin = self.raw_bytes and '\0' in self.raw_bytes
         return _bin
 
     @LazyProperty
@@ -502,7 +516,7 b' class FileNode(Node):'
         all_lines, empty_lines = 0, 0
 
         if not self.is_binary:
-            content = self._get_content()
+            content = self.content
             if count_empty:
                 all_lines = 0
                 empty_lines = 0
@@ -717,22 +731,10 b' class LargeFileNode(FileNode):'
         we override check since the LargeFileNode path is system absolute
         """
 
-    def _get_content(self):
+    def raw_bytes(self):
         if self.commit:
             with open(self.path, 'rb') as f:
                 content = f.read()
         else:
             content = self._content
-        return content
-
-    @property
-    def content(self):
-        """
-        Returns lazily content of the `FileNode`. If possible, would try to
-        decode content from UTF-8.
-        """
-        content = self._get_content()
-
-        if bool(content and '\0' in content):
-            return content
-        return safe_unicode(content)
+        return content
  No newline at end of file

rhodecode/lib/vcs/utils/helpers.py

@@ -38,39 +38,19 b' from rhodecode.lib.vcs.exceptions import'
 log = logging.getLogger(__name__)
 
 
-def get_scm(path, search_path_up=False, explicit_alias=None):
+def get_scm(path):
     """
     Returns one of alias from ``ALIASES`` (in order of precedence same as
-    shortcuts given in ``ALIASES``) and top working dir path for the given
+    shortcuts given in ``ALIASES``) and working dir path for the given
     argument. If no scm-specific directory is found or more than one scm is
     found at that directory, ``VCSError`` is raised.
-
-    :param search_path_up: if set to ``True``, this function would try to
-      move up to parent directory every time no scm is recognized for the
-      currently checked path. Default: ``False``.
-    :param explicit_alias: can be one of available backend aliases, when given
-      it will return given explicit alias in repositories under more than one
-      version control, if explicit_alias is different than found it will raise
-      VCSError
     """
     if not os.path.isdir(path):
         raise VCSError("Given path %s is not a directory" % path)
 
-    def get_scms(path):
-        return [(scm, path) for scm in get_scms_for_path(path)]
-
-    found_scms = get_scms(path)
-    while not found_scms and search_path_up:
-        newpath = os.path.abspath(os.path.join(path, os.pardir))
-        if newpath == path:
-            break
-        path = newpath
-        found_scms = get_scms(path)
+    found_scms = [(scm, path) for scm in get_scms_for_path(path)]
 
     if len(found_scms) > 1:
-        for scm in found_scms:
-            if scm[0] == explicit_alias:
-                return scm
         found = ', '.join((x[0] for x in found_scms))
         raise VCSError(
             'More than one [%s] scm found at given path %s' % (found, path))

rhodecode/login/views.py

@@ -327,8 +327,11 b' class LoginView(object):'
         if self.request.GET and self.request.GET.get('key'):
             try:
                 user = User.get_by_auth_token(self.request.GET.get('key'))
+                password_reset_url = self.request.route_url(
+                    'reset_password_confirmation',
+                    _query={'key': user.api_key})
                 data = {'email': user.email}
-                UserModel().reset_password(data)
+                UserModel().reset_password(data, password_reset_url)
                 self.session.flash(
                     _('Your password reset was successful, '
                       'a new password has been sent to your email'),

rhodecode/model/__init__.py

@@ -145,17 +145,6 b' class BaseModel(object):'
         return self._get_instance(
             db.Permission, permission, callback=db.Permission.get_by_key)
 
-    def send_event(self, event):
-        """
-        Helper method to send an event. This wraps the pyramid logic to send an
-        event.
-        """
-        # For the first step we are using pyramids thread locals here. If the
-        # event mechanism works out as a good solution we should think about
-        # passing the registry into the constructor to get rid of it.
-        registry = get_current_registry()
-        registry.notify(event)
-
     @classmethod
     def get_all(cls):
         """

rhodecode/model/comment.py

@@ -26,10 +26,15 b' import logging'
 import traceback
 import collections
 
+from datetime import datetime
+
+from pylons.i18n.translation import _
+from pyramid.threadlocal import get_current_registry
 from sqlalchemy.sql.expression import null
 from sqlalchemy.sql.functions import coalesce
 
 from rhodecode.lib import helpers as h, diffs
+from rhodecode.lib.channelstream import channelstream_request
 from rhodecode.lib.utils import action_logger
 from rhodecode.lib.utils2 import extract_mentioned_users
 from rhodecode.model import BaseModel
@@ -77,7 +82,8 b' class ChangesetCommentsModel(BaseModel):'
         return global_renderer
 
     def create(self, text, repo, user, revision=None, pull_request=None,
-               f_path=None, line_no=None, status_change=None, closing_pr=False,
+               f_path=None, line_no=None, status_change=None,
+               status_change_type=None, closing_pr=False,
                send_email=True, renderer=None):
         """
         Creates new comment for commit or pull request.
@@ -91,7 +97,8 b' class ChangesetCommentsModel(BaseModel):'
         :param pull_request:
         :param f_path:
         :param line_no:
-        :param status_change:
+        :param status_change: Label for status change
+        :param status_change_type: type of status change
         :param closing_pr:
         :param send_email:
         """
@@ -134,89 +141,83 b' class ChangesetCommentsModel(BaseModel):'
 
         Session().add(comment)
         Session().flush()
-
-        if send_email:
-            kwargs = {
-                'user': user,
-                'renderer_type': renderer,
-                'repo_name': repo.repo_name,
-                'status_change': status_change,
-                'comment_body': text,
-                'comment_file': f_path,
-                'comment_line': line_no,
-            }
+        kwargs = {
+            'user': user,
+            'renderer_type': renderer,
+            'repo_name': repo.repo_name,
+            'status_change': status_change,
+            'status_change_type': status_change_type,
+            'comment_body': text,
+            'comment_file': f_path,
+            'comment_line': line_no,
+        }
 
-            if commit_obj:
-                recipients = ChangesetComment.get_users(
-                    revision=commit_obj.raw_id)
-                # add commit author if it's in RhodeCode system
-                cs_author = User.get_from_cs_author(commit_obj.author)
-                if not cs_author:
-                    # use repo owner if we cannot extract the author correctly
-                    cs_author = repo.user
-                recipients += [cs_author]
+        if commit_obj:
+            recipients = ChangesetComment.get_users(
+                revision=commit_obj.raw_id)
+            # add commit author if it's in RhodeCode system
+            cs_author = User.get_from_cs_author(commit_obj.author)
+            if not cs_author:
+                # use repo owner if we cannot extract the author correctly
+                cs_author = repo.user
+            recipients += [cs_author]
+
+            commit_comment_url = self.get_url(comment)
 
-                commit_comment_url = h.url(
-                    'changeset_home',
-                    repo_name=repo.repo_name,
-                    revision=commit_obj.raw_id,
-                    anchor='comment-%s' % comment.comment_id,
-                    qualified=True,)
+            target_repo_url = h.link_to(
+                repo.repo_name,
+                h.url('summary_home',
+                      repo_name=repo.repo_name, qualified=True))
 
-                target_repo_url = h.link_to(
-                    repo.repo_name,
-                    h.url('summary_home',
-                          repo_name=repo.repo_name, qualified=True))
-
-                # commit specifics
-                kwargs.update({
-                    'commit': commit_obj,
-                    'commit_message': commit_obj.message,
-                    'commit_target_repo': target_repo_url,
-                    'commit_comment_url': commit_comment_url,
-                })
+            # commit specifics
+            kwargs.update({
+                'commit': commit_obj,
+                'commit_message': commit_obj.message,
+                'commit_target_repo': target_repo_url,
+                'commit_comment_url': commit_comment_url,
+            })
 
-            elif pull_request_obj:
-                # get the current participants of this pull request
-                recipients = ChangesetComment.get_users(
-                    pull_request_id=pull_request_obj.pull_request_id)
-                # add pull request author
-                recipients += [pull_request_obj.author]
+        elif pull_request_obj:
+            # get the current participants of this pull request
+            recipients = ChangesetComment.get_users(
+                pull_request_id=pull_request_obj.pull_request_id)
+            # add pull request author
+            recipients += [pull_request_obj.author]
 
-                # add the reviewers to notification
-                recipients += [x.user for x in pull_request_obj.reviewers]
+            # add the reviewers to notification
+            recipients += [x.user for x in pull_request_obj.reviewers]
 
-                pr_target_repo = pull_request_obj.target_repo
-                pr_source_repo = pull_request_obj.source_repo
+            pr_target_repo = pull_request_obj.target_repo
+            pr_source_repo = pull_request_obj.source_repo
 
-                pr_comment_url = h.url(
-                    'pullrequest_show',
-                    repo_name=pr_target_repo.repo_name,
-                    pull_request_id=pull_request_obj.pull_request_id,
-                    anchor='comment-%s' % comment.comment_id,
-                    qualified=True,)
+            pr_comment_url = h.url(
+                'pullrequest_show',
+                repo_name=pr_target_repo.repo_name,
+                pull_request_id=pull_request_obj.pull_request_id,
+                anchor='comment-%s' % comment.comment_id,
+                qualified=True,)
 
-                # set some variables for email notification
-                pr_target_repo_url = h.url(
-                    'summary_home', repo_name=pr_target_repo.repo_name,
-                    qualified=True)
+            # set some variables for email notification
+            pr_target_repo_url = h.url(
+                'summary_home', repo_name=pr_target_repo.repo_name,
+                qualified=True)
 
-                pr_source_repo_url = h.url(
-                    'summary_home', repo_name=pr_source_repo.repo_name,
-                    qualified=True)
+            pr_source_repo_url = h.url(
+                'summary_home', repo_name=pr_source_repo.repo_name,
+                qualified=True)
 
-                # pull request specifics
-                kwargs.update({
-                    'pull_request': pull_request_obj,
-                    'pr_id': pull_request_obj.pull_request_id,
-                    'pr_target_repo': pr_target_repo,
-                    'pr_target_repo_url': pr_target_repo_url,
-                    'pr_source_repo': pr_source_repo,
-                    'pr_source_repo_url': pr_source_repo_url,
-                    'pr_comment_url': pr_comment_url,
-                    'pr_closing': closing_pr,
-                })
-
+            # pull request specifics
+            kwargs.update({
+                'pull_request': pull_request_obj,
+                'pr_id': pull_request_obj.pull_request_id,
+                'pr_target_repo': pr_target_repo,
+                'pr_target_repo_url': pr_target_repo_url,
+                'pr_source_repo': pr_source_repo,
+                'pr_source_repo_url': pr_source_repo_url,
+                'pr_comment_url': pr_comment_url,
+                'pr_closing': closing_pr,
+            })
+        if send_email:
             # pre-generate the subject for notification itself
             (subject,
              _h, _e,  # we don't care about those
@@ -245,6 +246,44 b' class ChangesetCommentsModel(BaseModel):'
         )
         action_logger(user, action, comment.repo)
 
+        registry = get_current_registry()
+        rhodecode_plugins = getattr(registry, 'rhodecode_plugins', {})
+        channelstream_config = rhodecode_plugins.get('channelstream', {})
+        msg_url = ''
+        if commit_obj:
+            msg_url = commit_comment_url
+            repo_name = repo.repo_name
+        elif pull_request_obj:
+            msg_url = pr_comment_url
+            repo_name = pr_target_repo.repo_name
+
+        if channelstream_config.get('enabled'):
+            message = '<strong>{}</strong> {} - ' \
+                      '<a onclick="window.location=\'{}\';' \
+                      'window.location.reload()">' \
+                      '<strong>{}</strong></a>'
+            message = message.format(
+                user.username, _('made a comment'), msg_url,
+                _('Show it now'))
+            channel = '/repo${}$/pr/{}'.format(
+                repo_name,
+                pull_request_id
+            )
+            payload = {
+                'type': 'message',
+                'timestamp': datetime.utcnow(),
+                'user': 'system',
+                'exclude_users': [user.username],
+                'channel': channel,
+                'message': {
+                    'message': message,
+                    'level': 'info',
+                    'topic': '/notifications'
+                }
+            }
+            channelstream_request(channelstream_config, [payload],
+                                  '/message', raise_exc=False)
+
         return comment
 
     def delete(self, comment):
@@ -271,6 +310,23 b' class ChangesetCommentsModel(BaseModel):'
         q = q.order_by(ChangesetComment.created_on)
         return q.all()
 
+    def get_url(self, comment):
+        comment = self.__get_commit_comment(comment)
+        if comment.pull_request:
+            return h.url(
+                'pullrequest_show',
+                repo_name=comment.pull_request.target_repo.repo_name,
+                pull_request_id=comment.pull_request.pull_request_id,
+                anchor='comment-%s' % comment.comment_id,
+                qualified=True,)
+        else:
+            return h.url(
+                'changeset_home',
+                repo_name=comment.repo.repo_name,
+                revision=comment.revision,
+                anchor='comment-%s' % comment.comment_id,
+                qualified=True,)
+
     def get_comments(self, repo_id, revision=None, pull_request=None):
         """
         Gets main comments based on revision or pull_request_id

rhodecode/model/db.py

@@ -49,7 +49,7 b' from zope.cachedescriptors.property impo'
 from pylons import url
 from pylons.i18n.translation import lazy_ugettext as _
 
-from rhodecode.lib.vcs import get_backend
+from rhodecode.lib.vcs import get_backend, get_vcs_instance
 from rhodecode.lib.vcs.utils.helpers import get_scm
 from rhodecode.lib.vcs.exceptions import VCSError
 from rhodecode.lib.vcs.backends.base import (
@@ -57,6 +57,7 b' from rhodecode.lib.vcs.backends.base imp'
 from rhodecode.lib.utils2 import (
     str2bool, safe_str, get_commit_safe, safe_unicode, remove_prefix, md5_safe,
     time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict)
+from rhodecode.lib.jsonalchemy import MutationObj, JsonType, JSONDict
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.lib.encrypt import AESCipher
@@ -720,7 +721,7 b' class User(Base, BaseModel):'
 
         if cache:
             q = q.options(FromCache("sql_cache_short",
-                                    "get_email_key_%s" % email))
+                                    "get_email_key_%s" % _hash_key(email)))
 
         ret = q.scalar()
         if ret is None:
@@ -908,7 +909,7 b' class UserApiKeys(Base, BaseModel):'
         return {
             cls.ROLE_ALL: _('all'),
             cls.ROLE_HTTP: _('http/web interface'),
-            cls.ROLE_VCS: _('vcs (git/hg protocol)'),
+            cls.ROLE_VCS: _('vcs (git/hg/svn protocol)'),
             cls.ROLE_API: _('api calls'),
             cls.ROLE_FEED: _('feed access'),
         }.get(role, role)
@@ -1330,6 +1331,8 b' class Repository(Base, BaseModel):'
         cascade="all, delete, delete-orphan")
     ui = relationship('RepoRhodeCodeUi', cascade="all")
     settings = relationship('RepoRhodeCodeSetting', cascade="all")
+    integrations = relationship('Integration',
+                                cascade="all, delete, delete-orphan")
 
     def __unicode__(self):
         return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id,
@@ -1641,6 +1644,7 b' class Repository(Base, BaseModel):'
             'repo_name': repo.repo_name,
             'repo_type': repo.repo_type,
             'clone_uri': repo.clone_uri or '',
+            'url': url('summary_home', repo_name=self.repo_name, qualified=True),
             'private': repo.private,
             'created_on': repo.created_on,
             'description': repo.description,
@@ -1861,7 +1865,8 b' class Repository(Base, BaseModel):'
             cs_cache = cs_cache.__json__()
 
         def is_outdated(new_cs_cache):
-            if new_cs_cache['raw_id'] != self.changeset_cache['raw_id']:
+            if (new_cs_cache['raw_id'] != self.changeset_cache['raw_id'] or
+                new_cs_cache['revision'] != self.changeset_cache['revision']):
                 return True
             return False
 
@@ -1972,7 +1977,7 b' class Repository(Base, BaseModel):'
             return self._get_instance()
 
         invalidator_context = CacheKey.repo_context_cache(
-            _get_repo, self.repo_name, None)
+            _get_repo, self.repo_name, None, thread_scoped=True)
 
         with invalidator_context as context:
             context.invalidate()
@@ -1981,27 +1986,16 b' class Repository(Base, BaseModel):'
         return repo
 
     def _get_instance(self, cache=True, config=None):
-        repo_full_path = self.repo_full_path
-        try:
-            vcs_alias = get_scm(repo_full_path)[0]
-            log.debug(
-                'Creating instance of %s repository from %s',
-                vcs_alias, repo_full_path)
-            backend = get_backend(vcs_alias)
-        except VCSError:
-            log.exception(
-                'Perhaps this repository is in db and not in '
-                'filesystem run rescan repositories with '
-                '"destroy old data" option from admin panel')
-            return
-
         config = config or self._config
         custom_wire = {
             'cache': cache  # controls the vcs.remote cache
         }
-        repo = backend(
-            safe_str(repo_full_path), config=config, create=False,
-            with_wire=custom_wire)
+
+        repo = get_vcs_instance(
+            repo_path=safe_str(self.repo_full_path),
+            config=config,
+            with_wire=custom_wire,
+            create=False)
 
         return repo
 
@@ -2854,7 +2848,8 b' class CacheKey(Base, BaseModel):'
         return None
 
     @classmethod
-    def repo_context_cache(cls, compute_func, repo_name, cache_type):
+    def repo_context_cache(cls, compute_func, repo_name, cache_type,
+                           thread_scoped=False):
         """
         @cache_region('long_term')
         def _heavy_calculation(cache_key):
@@ -2870,7 +2865,8 b' class CacheKey(Base, BaseModel):'
         assert computed == 'result'
         """
         from rhodecode.lib import caches
-        return caches.InvalidationContext(compute_func, repo_name, cache_type)
+        return caches.InvalidationContext(
+            compute_func, repo_name, cache_type, thread_scoped=thread_scoped)
 
 
 class ChangesetComment(Base, BaseModel):
@@ -3111,10 +3107,9 b' class PullRequest(Base, _PullRequestBase'
         merge_status = PullRequestModel().merge_status(pull_request)
         data = {
             'pull_request_id': pull_request.pull_request_id,
-            'url': url('pullrequest_show',
-                       repo_name=pull_request.target_repo.repo_name,
-                       pull_request_id=pull_request.pull_request_id,
-                       qualified=True),
+            'url': url('pullrequest_show', repo_name=self.target_repo.repo_name,
+                                       pull_request_id=self.pull_request_id,
+                                       qualified=True),
             'title': pull_request.title,
             'description': pull_request.description,
             'status': pull_request.status,
@@ -3395,10 +3390,9 b' class Gist(Base, BaseModel):'
     # SCM functions
 
     def scm_instance(self, **kwargs):
-        from rhodecode.lib.vcs import get_repo
-        base_path = self.base_path()
-        return get_repo(os.path.join(*map(safe_str,
-                                          [base_path, self.gist_access_id])))
+        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)
 
 
 class DbMigrateVersion(Base, BaseModel):
@@ -3474,3 +3468,32 b' class ExternalIdentity(Base, BaseModel):'
         query = cls.query()
         query = query.filter(cls.local_user_id == local_user_id)
         return query
+
+
+class Integration(Base, BaseModel):
+    __tablename__ = 'integrations'
+    __table_args__ = (
+        {'extend_existing': True, 'mysql_engine': 'InnoDB',
+         'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
+    )
+
+    integration_id = Column('integration_id', Integer(), primary_key=True)
+    integration_type = Column('integration_type', String(255))
+    enabled = Column('enabled', Boolean(), nullable=False)
+    name = Column('name', String(255), nullable=False)
+
+    settings = Column(
+        'settings_json', MutationObj.as_mutable(
+            JsonType(dialect_map=dict(mysql=UnicodeText(16384)))))
+    repo_id = Column(
+        'repo_id', Integer(), ForeignKey('repositories.repo_id'),
+        nullable=True, unique=None, default=None)
+    repo = relationship('Repository', lazy='joined')
+
+    def __repr__(self):
+        if self.repo:
+            scope = 'repo=%r' % self.repo
+        else:
+            scope = 'global'
+
+        return '<Integration(%r, %r)>' % (self.integration_type, scope)

rhodecode/model/forms.py

@@ -41,19 +41,38 b' for SELECT use formencode.All(OneOf(list'
 
 """
 
+import deform
 import logging
+import formencode
 
-import formencode
+from pkg_resources import resource_filename
 from formencode import All, Pipe
 
 from pylons.i18n.translation import _
 
 from rhodecode import BACKENDS
+from rhodecode.lib import helpers
 from rhodecode.model import validators as v
 
 log = logging.getLogger(__name__)
 
 
+deform_templates = resource_filename('deform', 'templates')
+rhodecode_templates = resource_filename('rhodecode', 'templates/forms')
+search_path = (rhodecode_templates, deform_templates)
+
+
+class RhodecodeFormZPTRendererFactory(deform.ZPTRendererFactory):
+    """ Subclass of ZPTRendererFactory to add rhodecode context variables """
+    def __call__(self, template_name, **kw):
+        kw['h'] = helpers
+        return self.load(template_name)(**kw)
+
+
+form_renderer = RhodecodeFormZPTRendererFactory(search_path)
+deform.Form.set_default_renderer(form_renderer)
+
+
 def LoginForm():
     class _LoginForm(formencode.Schema):
         allow_extra_fields = True
@@ -382,6 +401,7 b' class _BaseVcsSettingsForm(formencode.Sc'
 
     rhodecode_pr_merge_enabled = v.StringBoolean(if_missing=False)
     rhodecode_use_outdated_comments = v.StringBoolean(if_missing=False)
+    rhodecode_hg_use_rebase_for_merging = v.StringBoolean(if_missing=False)
 
 
 def ApplicationUiSettingsForm():
@@ -415,7 +435,6 b' def LabsSettingsForm():'
         allow_extra_fields = True
         filter_extra_fields = False
 
-        rhodecode_hg_use_rebase_for_merging = v.StringBoolean(if_missing=False)
         rhodecode_proxy_subversion_http_requests = v.StringBoolean(
             if_missing=False)
         rhodecode_subversion_http_server_url = v.UnicodeString(
@@ -536,23 +555,6 b' def PullRequestForm(repo_id):'
     return _PullRequestForm
 
 
-def GistForm(lifetime_options, acl_level_options):
-    class _GistForm(formencode.Schema):
-
-        gistid = All(v.UniqGistId(), v.UnicodeString(strip=True, min=3, not_empty=False, if_missing=None))
-        filename = All(v.BasePath()(),
-                       v.UnicodeString(strip=True, required=False))
-        description = v.UnicodeString(required=False, if_missing=u'')
-        lifetime = v.OneOf(lifetime_options)
-        mimetype = v.UnicodeString(required=False, if_missing=None)
-        content = v.UnicodeString(required=True, not_empty=True)
-        public = v.UnicodeString(required=False, if_missing=u'')
-        private = v.UnicodeString(required=False, if_missing=u'')
-        acl_level = v.OneOf(acl_level_options)
-
-    return _GistForm
-
-
 def IssueTrackerPatternsForm():
     class _IssueTrackerPatternsForm(formencode.Schema):
         allow_extra_fields = True

rhodecode/model/gist.py

@@ -107,7 +107,7 b' class GistModel(BaseModel):'
 
         :param description: description of the gist
         :param owner: user who created this gist
-        :param gist_mapping: mapping {filename:{'content':content},...}
+        :param gist_mapping: mapping [{'filename': 'file1.txt', 'content': content}, ...}]
         :param gist_type: type of gist private/public
         :param lifetime: in minutes, -1 == forever
         :param gist_acl_level: acl level for this gist
@@ -141,25 +141,10 b' class GistModel(BaseModel):'
             repo_name=gist_id, repo_type='hg', repo_group=GIST_STORE_LOC,
             use_global_config=True)
 
-        processed_mapping = {}
-        for filename in gist_mapping:
-            if filename != os.path.basename(filename):
-                raise Exception('Filename cannot be inside a directory')
-
-            content = gist_mapping[filename]['content']
-            # TODO: expand support for setting explicit lexers
-#             if lexer is None:
-#                 try:
-#                     guess_lexer = pygments.lexers.guess_lexer_for_filename
-#                     lexer = guess_lexer(filename,content)
-#                 except pygments.util.ClassNotFound:
-#                     lexer = 'text'
-            processed_mapping[filename] = {'content': content}
-
         # now create single multifile commit
         message = 'added file'
-        message += 's: ' if len(processed_mapping) > 1 else ': '
-        message += ', '.join([x for x in processed_mapping])
+        message += 's: ' if len(gist_mapping) > 1 else ': '
+        message += ', '.join([x for x in gist_mapping])
 
         # fake RhodeCode Repository object
         fake_repo = AttributeDict({
@@ -170,7 +155,7 b' class GistModel(BaseModel):'
         ScmModel().create_nodes(
             user=owner.user_id, repo=fake_repo,
             message=message,
-            nodes=processed_mapping,
+            nodes=gist_mapping,
             trigger_push_hook=False
         )
 
@@ -196,7 +181,6 b' class GistModel(BaseModel):'
         gist = self._get_gist(gist)
         gist_repo = gist.scm_instance()
 
-        lifetime = safe_int(lifetime, -1)
         if lifetime == 0:  # preserve old value
             gist_expires = gist.gist_expires
         else:
@@ -207,9 +191,9 b' class GistModel(BaseModel):'
         gist_mapping_op = {}
         for k, v in gist_mapping.items():
             # add, mod, del
-            if not v['org_filename'] and v['filename']:
+            if not v['filename_org'] and v['filename']:
                 op = 'add'
-            elif v['org_filename'] and not v['filename']:
+            elif v['filename_org'] and not v['filename']:
                 op = 'del'
             else:
                 op = 'mod'

rhodecode/model/notification.py

@@ -327,7 +327,8 b' class EmailNotificationModel(BaseModel):'
         :return:
         """
         _kwargs = {
-            'instance_url': h.url('home', qualified=True)
+            'instance_url': h.url('home', qualified=True),
+            'rhodecode_instance_name': getattr(c, 'rhodecode_name', '')
         }
         _kwargs.update(kwargs)
         return _kwargs
@@ -339,7 +340,7 b' class EmailNotificationModel(BaseModel):'
     def render_email(self, type_, **kwargs):
         """
         renders template for email, and returns a tuple of
-        (subject, email_headers, email_body)
+        (subject, email_headers, email_html_body, email_plaintext_body)
         """
         # translator and helpers inject
         _kwargs = self._update_kwargs_for_render(kwargs)

rhodecode/model/pull_request.py

@@ -31,7 +31,6 b' import datetime'
 from pylons.i18n.translation import _
 from pylons.i18n.translation import lazy_ugettext
 
-import rhodecode
 from rhodecode.lib import helpers as h, hooks_utils, diffs
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.hooks_daemon import prepare_callback_daemon
@@ -41,13 +40,14 b' from rhodecode.lib.utils import action_l'
 from rhodecode.lib.utils2 import safe_unicode, safe_str, md5_safe
 from rhodecode.lib.vcs.backends.base import (
     Reference, MergeResponse, MergeFailureReason)
+from rhodecode.lib.vcs.conf import settings as vcs_settings
 from rhodecode.lib.vcs.exceptions import (
     CommitDoesNotExistError, EmptyRepositoryError)
 from rhodecode.model import BaseModel
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.comment import ChangesetCommentsModel
 from rhodecode.model.db import (
-    PullRequest, PullRequestReviewers, Notification, ChangesetStatus,
+    PullRequest, PullRequestReviewers, ChangesetStatus,
     PullRequestVersion, ChangesetComment)
 from rhodecode.model.meta import Session
 from rhodecode.model.notification import NotificationModel, \
@@ -423,11 +423,11 b' class PullRequestModel(BaseModel):'
             }
 
         workspace_id = self._workspace_id(pull_request)
-        protocol = rhodecode.CONFIG.get('vcs.hooks.protocol')
-        use_direct_calls = rhodecode.CONFIG.get('vcs.hooks.direct_calls')
+        use_rebase = self._use_rebase_for_merging(pull_request)
 
         callback_daemon, extras = prepare_callback_daemon(
-            extras, protocol=protocol, use_direct_calls=use_direct_calls)
+            extras, protocol=vcs_settings.HOOKS_PROTOCOL,
+            use_direct_calls=vcs_settings.HOOKS_DIRECT_CALLS)
 
         with callback_daemon:
             # TODO: johbo: Implement a clean way to run a config_override
@@ -437,7 +437,7 b' class PullRequestModel(BaseModel):'
             merge_state = target_vcs.merge(
                 target_ref, source_vcs, pull_request.source_ref_parts,
                 workspace_id, user_name=user.username,
-                user_email=user.email, message=message)
+                user_email=user.email, message=message, use_rebase=use_rebase)
         return merge_state
 
     def _comment_and_close_pr(self, pull_request, user, merge_state):
@@ -747,6 +747,12 b' class PullRequestModel(BaseModel):'
 
         return ids_to_add, ids_to_remove
 
+    def get_url(self, pull_request):
+        return h.url('pullrequest_show',
+                     repo_name=safe_str(pull_request.target_repo.repo_name),
+                     pull_request_id=pull_request.pull_request_id,
+                     qualified=True)
+
     def notify_reviewers(self, pull_request, reviewers_ids):
         # notification to reviewers
         if not reviewers_ids:
@@ -847,6 +853,7 b' class PullRequestModel(BaseModel):'
             f_path=None,
             line_no=None,
             status_change=ChangesetStatus.get_status_lbl(status),
+            status_change_type=status,
             closing_pr=True
         )
 
@@ -955,9 +962,10 b' class PullRequestModel(BaseModel):'
     def _refresh_merge_state(self, pull_request, target_vcs, target_reference):
         workspace_id = self._workspace_id(pull_request)
         source_vcs = pull_request.source_repo.scm_instance()
+        use_rebase = self._use_rebase_for_merging(pull_request)
         merge_state = target_vcs.merge(
             target_reference, source_vcs, pull_request.source_ref_parts,
-            workspace_id, dry_run=True)
+            workspace_id, dry_run=True, use_rebase=use_rebase)
 
         # Do not store the response if there was an unknown error.
         if merge_state.failure_reason != MergeFailureReason.UNKNOWN:
@@ -1126,6 +1134,11 b' class PullRequestModel(BaseModel):'
         settings = settings_model.get_general_settings()
         return settings.get('rhodecode_pr_merge_enabled', False)
 
+    def _use_rebase_for_merging(self, pull_request):
+        settings_model = VcsSettingsModel(repo=pull_request.target_repo)
+        settings = settings_model.get_general_settings()
+        return settings.get('rhodecode_hg_use_rebase_for_merging', False)
+
     def _log_action(self, action, user, pull_request):
         action_logger(
             user,

rhodecode/model/repo.py

@@ -34,6 +34,7 b' from sqlalchemy.sql import func'
 from sqlalchemy.sql.expression import true, or_
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
+from rhodecode import events
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import HasUserGroupPermissionAny
 from rhodecode.lib.caching_query import FromCache
@@ -140,6 +141,10 b' class RepoModel(BaseModel):'
 
         return None
 
+    def get_url(self, repo):
+        return h.url('summary_home', repo_name=safe_str(repo.repo_name),
+            qualified=True)
+
     def get_users(self, name_contains=None, limit=20, only_active=True):
         # TODO: mikhail: move this method to the UserModel.
         query = self.sa.query(User)
@@ -470,6 +475,8 b' class RepoModel(BaseModel):'
                 parent_repo = fork_of
                 new_repo.fork = parent_repo
 
+            events.trigger(events.RepoPreCreateEvent(new_repo))
+
             self.sa.add(new_repo)
 
             EMPTY_PERM = 'repository.none'
@@ -525,11 +532,13 b' class RepoModel(BaseModel):'
             # now automatically start following this repository as owner
             ScmModel(self.sa).toggle_following_repo(new_repo.repo_id,
                                                     owner.user_id)
+
             # we need to flush here, in order to check if database won't
             # throw any exceptions, create filesystem dirs at the very end
             self.sa.flush()
+            events.trigger(events.RepoCreateEvent(new_repo))
+            return new_repo
 
-            return new_repo
         except Exception:
             log.error(traceback.format_exc())
             raise
@@ -633,6 +642,7 b' class RepoModel(BaseModel):'
                 raise AttachedForksError()
 
             old_repo_dict = repo.get_dict()
+            events.trigger(events.RepoPreDeleteEvent(repo))
             try:
                 self.sa.delete(repo)
                 if fs_remove:
@@ -644,6 +654,7 b' class RepoModel(BaseModel):'
                     'deleted_on': time.time(),
                 })
                 log_delete_repository(**old_repo_dict)
+                events.trigger(events.RepoDeleteEvent(repo))
             except Exception:
                 log.error(traceback.format_exc())
                 raise

rhodecode/model/repo_group.py

@@ -33,6 +33,7 b' import traceback'
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
+from rhodecode import events
 from rhodecode.model import BaseModel
 from rhodecode.model.db import (
     RepoGroup, UserRepoGroupToPerm, User, Permission, UserGroupRepoGroupToPerm,
@@ -257,6 +258,9 b' class RepoGroupModel(BaseModel):'
             log_create_repository_group(
                 created_by=user.username, **repo_group.get_dict())
 
+            # Trigger create event.
+            events.trigger(events.RepoGroupCreateEvent(repo_group))
+
             return new_repo_group
         except Exception:
             self.sa.rollback()
@@ -455,6 +459,9 b' class RepoGroupModel(BaseModel):'
 
             self._rename_group(old_path, new_path)
 
+            # Trigger update event.
+            events.trigger(events.RepoGroupUpdateEvent(repo_group))
+
             return repo_group
         except Exception:
             log.error(traceback.format_exc())
@@ -469,6 +476,9 b' class RepoGroupModel(BaseModel):'
             else:
                 log.debug('skipping removal from filesystem')
 
+            # Trigger delete event.
+            events.trigger(events.RepoGroupDeleteEvent(repo_group))
+
         except Exception:
             log.error('Error removing repo_group %s', repo_group)
             raise

rhodecode/model/scm.py

@@ -279,11 +279,7 b' class ScmModel(BaseModel):'
         if repo:
             config = repo._config
             config.set('extensions', 'largefiles', '')
-            cs_cache = None
-            if delete:
-                # if we do a hard clear, reset last-commit to Empty
-                cs_cache = EmptyCommit()
-            repo.update_commit_cache(config=config, cs_cache=cs_cache)
+            repo.update_commit_cache(config=config, cs_cache=None)
             caches.clear_repo_caches(repo_name)
 
     def toggle_following_repo(self, follow_repo_id, user_id):
@@ -482,7 +478,7 b' class ScmModel(BaseModel):'
         return data
 
     def get_nodes(self, repo_name, commit_id, root_path='/', flat=True,
-                  extended_info=False, content=False):
+                  extended_info=False, content=False, max_file_bytes=None):
         """
         recursive walk in root dir and return a set of all path in that dir
         based on repository walk function
@@ -490,7 +486,8 b' class ScmModel(BaseModel):'
         :param repo_name: name of repository
         :param commit_id: commit id for which to list nodes
         :param root_path: root path to list
-        :param flat: return as a list, if False returns a dict with decription
+        :param flat: return as a list, if False returns a dict with description
+        :param max_file_bytes: will not return file contents over this limit
 
         """
         _files = list()
@@ -503,31 +500,31 b' class ScmModel(BaseModel):'
                 for f in files:
                     _content = None
                     _data = f.unicode_path
+                    over_size_limit = (max_file_bytes is not None
+                                       and f.size > max_file_bytes)
+
                     if not flat:
                         _data = {
                             "name": f.unicode_path,
                             "type": "file",
                             }
                         if extended_info:
-                            _content = safe_str(f.content)
                             _data.update({
-                                "md5": md5(_content),
+                                "md5": f.md5,
                                 "binary": f.is_binary,
                                 "size": f.size,
                                 "extension": f.extension,
-
                                 "mimetype": f.mimetype,
                                 "lines": f.lines()[0]
                             })
+
                         if content:
                             full_content = None
-                            if not f.is_binary:
-                                # in case we loaded the _content already
-                                # re-use it, or load from f[ile]
-                                full_content = _content or safe_str(f.content)
+                            if not f.is_binary and not over_size_limit:
+                                full_content = safe_str(f.content)
 
                             _data.update({
-                                "content": full_content
+                                "content": full_content,
                             })
                     _files.append(_data)
                 for d in dirs:

rhodecode/model/settings.py

@@ -198,7 +198,7 b' class SettingsModel(BaseModel):'
                 # update if set
                 res.app_settings_value = val
 
-        Session.add(res)
+        Session().add(res)
         return res
 
     def invalidate_settings_cache(self):
@@ -401,7 +401,9 b' class IssueTrackerSettingsModel(object):'
 class VcsSettingsModel(object):
 
     INHERIT_SETTINGS = 'inherit_vcs_settings'
-    GENERAL_SETTINGS = ('use_outdated_comments', 'pr_merge_enabled')
+    GENERAL_SETTINGS = (
+        'use_outdated_comments', 'pr_merge_enabled',
+        'hg_use_rebase_for_merging')
     HOOKS_SETTINGS = (
         ('hooks', 'changegroup.repo_size'),
         ('hooks', 'changegroup.push_logger'),

rhodecode/model/user.py

@@ -32,7 +32,7 b' import ipaddress'
 from sqlalchemy.exc import DatabaseError
 from sqlalchemy.sql.expression import true, false
 
-from rhodecode.events import UserPreCreate, UserPreUpdate
+from rhodecode import events
 from rhodecode.lib.utils2 import (
     safe_unicode, get_current_rhodecode_user, action_logger_generic,
     AttributeDict)
@@ -270,12 +270,12 b' class UserModel(BaseModel):'
                 # raises UserCreationError if it's not allowed for any reason to
                 # create new active user, this also executes pre-create hooks
                 check_allowed_create_user(user_data, cur_user, strict_check=True)
-            self.send_event(UserPreCreate(user_data))
+            events.trigger(events.UserPreCreate(user_data))
             new_user = User()
             edit = False
         else:
             log.debug('updating user %s', username)
-            self.send_event(UserPreUpdate(user, user_data))
+            events.trigger(events.UserPreUpdate(user, user_data))
             new_user = user
             edit = True
 
@@ -532,7 +532,7 b' class UserModel(BaseModel):'
 
         return True
 
-    def reset_password(self, data):
+    def reset_password(self, data, pwd_reset_url):
         from rhodecode.lib.celerylib import tasks, run_task
         from rhodecode.model.notification import EmailNotificationModel
         from rhodecode.lib import auth
@@ -557,6 +557,7 b' class UserModel(BaseModel):'
 
             email_kwargs = {
                 'new_password': new_passwd,
+                'password_reset_url': pwd_reset_url,
                 'user': user,
                 'email': user_email,
                 'date': datetime.datetime.now()

rhodecode/model/validators.py

@@ -970,22 +970,6 b' def FieldKey():'
     return _validator
 
 
-def BasePath():
-    class _validator(formencode.validators.FancyValidator):
-        messages = {
-            'badPath': _(u'Filename cannot be inside a directory'),
-        }
-
-        def _to_python(self, value, state):
-            return value
-
-        def validate_python(self, value, state):
-            if value != os.path.basename(value):
-                raise formencode.Invalid(self.message('badPath', state),
-                                         value, state)
-    return _validator
-
-
 def ValidAuthPlugins():
     class _validator(formencode.validators.FancyValidator):
         messages = {
@@ -1061,26 +1045,6 b' def ValidAuthPlugins():'
     return _validator
 
 
-def UniqGistId():
-    class _validator(formencode.validators.FancyValidator):
-        messages = {
-            'gistid_taken': _(u'This gistid is already in use')
-        }
-
-        def _to_python(self, value, state):
-            return repo_name_slug(value.lower())
-
-        def validate_python(self, value, state):
-            existing = Gist.get_by_access_id(value)
-            if existing:
-                msg = M(self, 'gistid_taken', state)
-                raise formencode.Invalid(
-                    msg, value, state, error_dict={'gistid': msg}
-                )
-
-    return _validator
-
-
 def ValidPattern():
 
     class _Validator(formencode.validators.FancyValidator):

rhodecode/public/css/code-block.less

@@ -494,16 +494,33 b' div.codeblock {'
 }
 
 .code-highlighttable,
-div.codeblock .code-body table {
-    width: 0 !important;
-    border: 0px !important;
-    margin: 0;
-    letter-spacing: normal;
+div.codeblock {
+
+    &.readme {
+        background-color: white;
+    }
+
+    .markdown-block table {
+        border-collapse: collapse;
 
+        th,
+        td {
+            padding: .5em !important;
+            border: @border-thickness solid @border-default-color !important;
+        }
+    }
 
-    td {
+    table {
+        width: 0 !important;
         border: 0px !important;
-        vertical-align: top;
+        margin: 0;
+        letter-spacing: normal;
+    
+    
+        td {
+            border: 0px !important;
+            vertical-align: top;
+        }
     }
 }
 

rhodecode/public/css/codemirror.less

@@ -165,7 +165,7 b' div.CodeMirror span.CodeMirror-nonmatchi'
 }
 
 /* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actuall scrolling happens, thus preventing shaking and
+   before actual scrolling happens, thus preventing shaking and
    flickering artifacts. */
 .CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
   position: absolute;
@@ -207,6 +207,11 b' div.CodeMirror span.CodeMirror-nonmatchi'
   z-index: 4;
   height: 100%;
 }
+.CodeMirror-gutter-background {
+  position: absolute;
+  top: 0; bottom: 0;
+  z-index: 4;
+}
 .CodeMirror-gutter-elt {
   position: absolute;
   cursor: default;
@@ -280,7 +285,7 b' div.CodeMirror span.CodeMirror-nonmatchi'
   overflow: hidden;
   visibility: hidden;
 }
-.CodeMirror-measure pre { position: static; }
+
 
 .CodeMirror div.CodeMirror-cursor {
   position: absolute;
@@ -288,11 +293,17 b' div.CodeMirror span.CodeMirror-nonmatchi'
   width: 0;
 }
 
+.CodeMirror-measure pre { position: static; }
+
 div.CodeMirror-cursors {
   visibility: hidden;
   position: relative;
   z-index: 3;
 }
+div.CodeMirror-dragcursors {
+  visibility: visible;
+}
+
 .CodeMirror-focused div.CodeMirror-cursors {
   visibility: visible;
 }
@@ -300,8 +311,8 b' div.CodeMirror-cursors {'
 .CodeMirror-selected { background: #d9d9d9; }
 .CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
 .CodeMirror-crosshair { cursor: crosshair; }
-.CodeMirror ::selection { background: #d7d4f0; }
-.CodeMirror ::-moz-selection { background: #d7d4f0; }
+.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
 
 .cm-searching {
   background: #ffa;

rhodecode/public/css/legacy_code_styles.less

@@ -177,8 +177,7 b' div.markdown-block p,'
 div.markdown-block blockquote,
 div.markdown-block dl,
 div.markdown-block li,
-div.markdown-block table,
-div.markdown-block pre {
+div.markdown-block table {
     margin: 15px 0 !important;
     margin: 3px 0px 13px 0px !important;
     color: #424242 !important;
@@ -189,6 +188,17 b' div.markdown-block pre {'
     line-height: 140% !important;
 }
 
+div.markdown-block pre {
+  margin: 15px 0 !important;
+  margin: 3px 0px 13px 0px !important;
+  padding: .5em;
+  color: #424242 !important;
+  font-size: 13px !important;
+  overflow: visible !important;
+  line-height: 140% !important;
+  background-color: @grey7;
+}
+
 div.markdown-block img {
         padding: 4px;
         border: @border-thickness solid @grey5;
@@ -265,7 +275,8 b' div.markdown-block code {'
 div.markdown-block pre {
     border: @border-thickness solid @grey5;
     overflow: auto;
-    padding: 4px 8px;
+    padding: .5em;
+    background-color: @grey7;
 }
 
 div.markdown-block pre > code {

rhodecode/public/css/main.less

@@ -25,6 +25,8 b''
 @import 'comments';
 @import 'panels-bootstrap';
 @import 'panels';
+@import 'toastr';
+@import 'deform';
 
 
 //--- BASE ------------------//
@@ -141,7 +143,7 b' input.inline[type="file"] {'
     h1 {
         color: @grey2;
     }
-    
+
     .error-branding {
         font-family: @text-semibold;
         color: @grey4;
@@ -310,13 +312,19 b' ul.auth_plugins {'
     .td-status {
         padding-left: .5em;
     }
-    .truncate {
+    .log-container .truncate {
         height: 2.75em;
         white-space: pre-line;
     }
     table.rctable .user {
         padding-left: 0;
     }
+    table.rctable {
+        td.td-description,
+        .rc-user {
+            min-width: auto;
+        }
+    }
 }
 
 // Pull Requests
@@ -670,6 +678,13 b' label {'
     }
 }
 
+.user-inline-data {
+    display: inline-block;
+    float: left;
+    padding-left: .5em;
+    line-height: 1.3em;
+}
+
 .rc-user { // gravatar + user wrapper
     float: left;
     position: relative;
@@ -1009,9 +1024,9 b' label {'
     padding: .9em;
     color: @grey3;
     background-color: @grey7;
-    border-right: @border-thickness solid @border-default-color; 
-    border-bottom: @border-thickness solid @border-default-color; 
-    border-left: @border-thickness solid @border-default-color; 
+    border-right: @border-thickness solid @border-default-color;
+    border-bottom: @border-thickness solid @border-default-color;
+    border-left: @border-thickness solid @border-default-color;
 }
 
 #repo_vcs_settings {
@@ -1601,6 +1616,10 b' BIN_FILENODE = 7'
 	float: right;
 }
 
+#notification-status{
+  display: inline;
+}
+
 // Repositories
 
 #summary.fields{
@@ -1864,15 +1883,6 b' h3.files_location{'
 	}
 }
 
-.file_author{
-	margin-bottom: @padding;
-
-	div{
-		display: inline-block;
-		margin-right: 0.5em;
-	}
-}
-
 .browser-cur-rev{
 	margin-bottom: @textmargin;
 }
@@ -1949,7 +1959,7 b' div.search-feedback-items {'
 	padding:0px 0px 0px 96px;
 }
 
-div.search-code-body { 
+div.search-code-body {
     background-color: #ffffff; padding: 5px 0 5px 10px;
     pre {
         .match { background-color: #faffa6;}

rhodecode/public/css/mergerly.css

@@ -1,4 +1,3 b''
-
 /* required */
 .mergely-column textarea { width: 80px; height: 200px; }
 .mergely-column { float: left; }
@@ -12,17 +11,19 b''
 .mergely-column { border: 1px solid #ccc; }
 .mergely-active { border: 1px solid #a3d1ff; }
 
-.mergely.a.rhs.start { border-top: 1px solid #ddffdd; }
-.mergely.a.lhs.start.end,
-.mergely.a.rhs.end { border-bottom: 1px solid #ddffdd; }
-.mergely.a.rhs { background-color: #ddffdd; }
-.mergely.a.lhs.start.end.first { border-bottom: 0; border-top: 1px solid #ddffdd; }
+.mergely.a,.mergely.d,.mergely.c { color: #000; }
 
-.mergely.d.lhs { background-color: #edc0c0; }
+.mergely.a.rhs.start { border-top: 1px solid #a3d1ff; }
+.mergely.a.lhs.start.end,
+.mergely.a.rhs.end { border-bottom: 1px solid #a3d1ff; }
+.mergely.a.rhs { background-color: #ddeeff; }
+.mergely.a.lhs.start.end.first { border-bottom: 0; border-top: 1px solid #a3d1ff; }
+
+.mergely.d.lhs { background-color: #ffe9e9; }
 .mergely.d.lhs.end,
-.mergely.d.rhs.start.end { border-bottom: 1px solid #ffdddd; }
-.mergely.d.rhs.start.end.first { border-bottom: 0; border-top: 1px solid #ffdddd; }
-.mergely.d.lhs.start { border-top: 1px solid #ffdddd; }
+.mergely.d.rhs.start.end { border-bottom: 1px solid #f8e8e8; }
+.mergely.d.rhs.start.end.first { border-bottom: 0; border-top: 1px solid #f8e8e8; }
+.mergely.d.lhs.start { border-top: 1px solid #f8e8e8; }
 
 .mergely.c.lhs,
 .mergely.c.rhs { background-color: #fafafa; }
@@ -31,11 +32,19 b''
 .mergely.c.lhs.end,
 .mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; }
 
-.mergely.ch.a.rhs { background-color: #ddffdd; }
-.mergely.ch.d.lhs { background-color: #ffdddd; }
-
+.mergely.ch.a.rhs { background-color: #ddeeff; }
+.mergely.ch.d.lhs { background-color: #ffe9e9; text-decoration: line-through; color: red !important; }
 
 .mergely-margin #compare-lhs-margin,
 .mergely-margin #compare-rhs-margin {
     cursor: pointer
 }
+
+.mergely.current.start { border-top: 1px solid #000 !important; }
+.mergely.current.end { border-bottom: 1px solid #000 !important; }
+.mergely.current.lhs.a.start.end,
+.mergely.current.rhs.d.start.end { border-top: 0 !important; }
+.mergely.current.CodeMirror-linenumber { color: #F9F9F9; font-weight: bold; background-color: #777; }
+
+.CodeMirror-linenumber { cursor: pointer; }
+.CodeMirror-code { color: #717171; }
  No newline at end of file

rhodecode/public/css/summary.less

@@ -138,6 +138,10 b''
 
 .summary .sidebar-right-content {
     margin-bottom: @space;
+
+    .rc-user {
+        min-width: 0;
+    }
 }
 
 .fieldset {
@@ -168,6 +172,10 b''
             overflow-x: auto;
         }
     }
+    .commit.truncate-wrap {
+        overflow:hidden;
+        text-overflow: ellipsis;
+    }
 }
 
 // expand commit message
@@ -254,15 +262,3 b''
     
 }
 
-#readme {
-    width: 100%;
-
-    .readme {
-        overflow-x: auto;
-        border: @border-thickness solid @border-default-color;
-        .border-radius(@border-radius);
-    }
-    .readme_box {
-        margin: 15px;
-    }
-}

rhodecode/public/css/tables.less

@@ -123,11 +123,6 b' table.dataTable {'
             }
         }
 
-        &.td-gravatar {
-            width: 16px;
-            padding: 0 5px;
-        }
-
         &.tags-col {
             padding-right: 0;
         }

rhodecode/public/js/mergerly.js

@@ -297,15 +297,15 b' jQuery.extend(Mgly.diff.prototype, {'
 	},
 	_optimize: function(ctx) {
 		var start = 0, end = 0;
-		while (start < ctx.length) {
-			while ((start < ctx.length) && (ctx.modified[start] == undefined || ctx.modified[start] == false)) {
+		while (start < ctx.codes.length) {
+			while ((start < ctx.codes.length) && (ctx.modified[start] == undefined || ctx.modified[start] == false)) {
 				start++;
 			}
 			end = start;
-			while ((end < ctx.length) && (ctx.modified[end] == true)) {
+			while ((end < ctx.codes.length) && (ctx.modified[end] == true)) {
 				end++;
 			}
-			if ((end < ctx.length) && (ctx.ctx[start] == ctx.codes[end])) {
+			if ((end < ctx.codes.length) && (ctx.codes[start] == ctx.codes[end])) {
 				ctx.modified[start] = false;
 				ctx.modified[end] = true;
 			}
@@ -438,8 +438,7 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 				if (this.resized) this.resized();
 			},
 			_debug: '', //scroll,draw,calc,diff,markup,change
-			resized: function() { },
-			finished: function () { }
+			resized: function() { }
 		};
 		var cmsettings = {
 			mode: 'text/plain',
@@ -497,7 +496,7 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 		if (direction == 'next') {
 			this._current_diff = Math.min(++this._current_diff, this.changes.length - 1);
 		}
-		else {
+		else if (direction == 'prev') {
 			this._current_diff = Math.max(--this._current_diff, 0);
 		}
 		this._scroll_to_change(this.changes[this._current_diff]);
@@ -540,10 +539,10 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 		if (this.settings.hasOwnProperty('sidebar')) {
 			// dynamically enable sidebars
 			if (this.settings.sidebar) {
-				jQuery(this.element).find('.mergely-margin').css({display: 'block'});
+				this.element.find('.mergely-margin').css({display: 'block'});
 			}
 			else {
-				jQuery(this.element).find('.mergely-margin').css({display: 'none'});
+				this.element.find('.mergely-margin').css({display: 'none'});
 			}
 		}
 		var le, re;
@@ -690,12 +689,12 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 		jQuery('<style type="text/css">' + cmstyle + '</style>').appendTo('head');
 
 		//bind
-		var rhstx = jQuery('#' + this.id + '-rhs').get(0);
+		var rhstx = this.element.find('#' + this.id + '-rhs').get(0);
 		if (!rhstx) {
 			console.error('rhs textarea not defined - Mergely not initialized properly');
 			return;
 		}
-		var lhstx = jQuery('#' + this.id + '-lhs').get(0);
+		var lhstx = this.element.find('#' + this.id + '-lhs').get(0);
 		if (!rhstx) {
 			console.error('lhs textarea not defined - Mergely not initialized properly');
 			return;
@@ -728,6 +727,38 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 			);
 			sz(true);
 		}
+
+		// scrollToDiff() from gutter
+		function gutterClicked(side, line, ev) {
+			// The "Merge left/right" buttons are also located in the gutter.
+			// Don't interfere with them:
+			if (ev.target && (jQuery(ev.target).closest('.merge-button').length > 0)) {
+				return;
+			}
+
+			// See if the user clicked the line number of a difference:
+			var i, change;
+			for (i = 0; i < this.changes.length; i++) {
+				change = this.changes[i];
+				if (line >= change[side+'-line-from'] && line <= change[side+'-line-to']) {
+					this._current_diff = i;
+					// I really don't like this here - something about gutterClick does not
+					// like mutating editor here.  Need to trigger the scroll to diff from
+					// a timeout.
+					setTimeout(function() { this.scrollToDiff(); }.bind(this), 10);
+					break;
+				}
+			}
+		}
+
+		this.editor[this.id + '-lhs'].on('gutterClick', function(cm, n, gutterClass, ev) {
+			gutterClicked.call(this, 'lhs', n, ev);
+		}.bind(this));
+
+		this.editor[this.id + '-rhs'].on('gutterClick', function(cm, n, gutterClass, ev) {
+			gutterClicked.call(this, 'rhs', n, ev);
+		}.bind(this));
+
 		//bind
 		var setv;
 		if (this.settings.lhs) {
@@ -745,23 +776,10 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 		var self = this;
 		var led = self.editor[self.id+'-lhs'];
 		var red = self.editor[self.id+'-rhs'];
-
-		var yref = led.getScrollerElement().offsetHeight * 0.5; // center between >0 and 1/2
-
 		// set cursors
 		led.setCursor(Math.max(change["lhs-line-from"],0), 0); // use led.getCursor().ch ?
 		red.setCursor(Math.max(change["rhs-line-from"],0), 0);
-
-		// using directly CodeMirror breaks canvas alignment
-		// var ly = led.charCoords({line: Math.max(change["lhs-line-from"],0), ch: 0}, "local").top;
-
-		// calculate scroll offset for current change. Warning: returns relative y position so we scroll to 0 first.
-		led.scrollTo(null, 0);
-		red.scrollTo(null, 0);
-		self._calculate_offsets(self.id+'-lhs', self.id+'-rhs', [change]);
-		led.scrollTo(null, Math.max(change["lhs-y-start"]-yref, 0));
-		red.scrollTo(null, Math.max(change["rhs-y-start"]-yref, 0));
-		// right pane should simply follows
+		led.scrollIntoView({line: change["lhs-line-to"]});
 	},
 
 	_scrolling: function(editor_name) {
@@ -922,13 +940,11 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 		this.trace('change', 'diff time', timer.stop());
 		this.changes = Mgly.DiffParser(d.normal_form());
 		this.trace('change', 'parse time', timer.stop());
-
 		if (this._current_diff === undefined && this.changes.length) {
 			// go to first difference on start-up
 			this._current_diff = 0;
 			this._scroll_to_change(this.changes[0]);
 		}
-
 		this.trace('change', 'scroll_to_change time', timer.stop());
 		this._calculate_offsets(editor_name1, editor_name2, this.changes);
 		this.trace('change', 'offsets time', timer.stop());
@@ -992,7 +1008,7 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 
 		// this is the distance from the top of the screen to the top of the
 		// content of the first codemirror editor
-		var topnode = jQuery('#' + this.id + ' .CodeMirror-measure').first();
+		var topnode = this.element.find('.CodeMirror-measure').first();
 		var top_offset = topnode.offset().top - 4;
 		if(!top_offset) return false;
 
@@ -1121,11 +1137,12 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 		return changes;
 	},
 	_markup_changes: function (editor_name1, editor_name2, changes) {
-		jQuery('.merge-button').remove(); // clear
+		this.element.find('.merge-button').remove(); //clear
 
 		var self = this;
 		var led = this.editor[editor_name1];
 		var red = this.editor[editor_name2];
+		var current_diff = this._current_diff;
 
 		var timer = new Mgly.Timer();
 		led.operation(function() {
@@ -1140,6 +1157,12 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 				led.addLineClass(llf, 'background', 'start');
 				led.addLineClass(llt, 'background', 'end');
 
+				if (current_diff == i) {
+					if (llf != llt) {
+						led.addLineClass(llf, 'background', 'current');
+					}
+					led.addLineClass(llt, 'background', 'current');
+				}
 				if (llf == 0 && llt == 0 && rlf == 0) {
 					led.addLineClass(llf, 'background', clazz.join(' '));
 					led.addLineClass(llf, 'background', 'first');
@@ -1186,6 +1209,12 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 				red.addLineClass(rlf, 'background', 'start');
 				red.addLineClass(rlt, 'background', 'end');
 
+				if (current_diff == i) {
+					if (rlf != rlt) {
+						red.addLineClass(rlf, 'background', 'current');
+					}
+					red.addLineClass(rlt, 'background', 'current');
+				}
 				if (rlf == 0 && rlt == 0 && llf == 0) {
 					red.addLineClass(rlf, 'background', clazz.join(' '));
 					red.addLineClass(rlf, 'background', 'first');
@@ -1286,11 +1315,12 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 				self.chfns[self.id + '-rhs'].push(m[0].markText(m[1], m[2], m[3]));
 			}
 		});
+
 		this.trace('change', 'LCS markup time', timer.stop());
 
 		// merge buttons
 		var ed = {lhs:led, rhs:red};
-		jQuery('.merge-button').on('click', function(ev){
+		this.element.find('.merge-button').on('click', function(ev){
 			// side of mouseenter
 			var side = 'rhs';
 			var oside = 'lhs';
@@ -1314,6 +1344,35 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 			self._merge_change(change, side, oside);
 			return false;
 		});
+
+		// gutter markup
+		var lhsLineNumbers = $('#mergely-lhs ~ .CodeMirror').find('.CodeMirror-linenumber');
+		var rhsLineNumbers = $('#mergely-rhs ~ .CodeMirror').find('.CodeMirror-linenumber');
+		rhsLineNumbers.removeClass('mergely current');
+		lhsLineNumbers.removeClass('mergely current');
+		for (var i = 0; i < changes.length; ++i) {
+			if (current_diff == i && change.op !== 'd') {
+				var change = changes[i];
+				var j, jf = change['rhs-line-from'], jt = change['rhs-line-to'] + 1;
+				for (j = jf; j < jt; j++) {
+					var n = (j + 1).toString();
+					rhsLineNumbers
+						.filter(function(i, node) { return $(node).text() === n; })
+					.addClass('mergely current');
+				}
+			}
+			if (current_diff == i && change.op !== 'a') {
+				var change = changes[i];
+				jf = change['lhs-line-from'], jt = change['lhs-line-to'] + 1;
+				for (j = jf; j < jt; j++) {
+					var n = (j + 1).toString();
+					lhsLineNumbers
+						.filter(function(i, node) { return $(node).text() === n; })
+					.addClass('mergely current');
+				}
+			}
+		}
+
 		this.trace('change', 'markup buttons time', timer.stop());
 	},
 	_merge_change :	function(change, side, oside) {
@@ -1373,8 +1432,8 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 		var gutter_height = jQuery(this.editor[editor_name1].getScrollerElement()).children(':first-child').height();
 		var dcanvas = document.getElementById(editor_name1 + '-' + editor_name2 + '-canvas');
 		if (dcanvas == undefined) throw 'Failed to find: ' + editor_name1 + '-' + editor_name2 + '-canvas';
-		var clhs = jQuery('#' + this.id + '-lhs-margin');
-		var crhs = jQuery('#' + this.id + '-rhs-margin');
+		var clhs = this.element.find('#' + this.id + '-lhs-margin');
+		var crhs = this.element.find('#' + this.id + '-rhs-margin');
 		return {
 			visible_page_height: visible_page_height,
 			gutter_height: gutter_height,
@@ -1405,7 +1464,7 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 		this.trace('draw', 'lhs-scroller-top', ex.lhs_scroller.scrollTop());
 		this.trace('draw', 'rhs-scroller-top', ex.rhs_scroller.scrollTop());
 
-		jQuery.each(jQuery.find('#' + this.id + ' canvas'), function () {
+		jQuery.each(this.element.find('canvas'), function () {
 			jQuery(this).get(0).height = ex.visible_page_height;
 		});
 
@@ -1427,6 +1486,10 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 		var vp = this._get_viewport(editor_name1, editor_name2);
 		for (var i = 0; i < changes.length; ++i) {
 			var change = changes[i];
+			var fill = this.settings.fgcolor[change['op']];
+            if (this._current_diff==i) {
+                fill = '#000';
+            }
 
 			this.trace('draw', change);
 			// margin indicators
@@ -1437,14 +1500,14 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 			this.trace('draw', 'marker calculated', lhs_y_start, lhs_y_end, rhs_y_start, rhs_y_end);
 
 			ctx_lhs.beginPath();
-			ctx_lhs.fillStyle = this.settings.fgcolor[(this._current_diff==i?'c':'')+change['op']];
+			ctx_lhs.fillStyle = fill;
 			ctx_lhs.strokeStyle = '#000';
 			ctx_lhs.lineWidth = 0.5;
 			ctx_lhs.fillRect(1.5, lhs_y_start, 4.5, Math.max(lhs_y_end - lhs_y_start, 5));
 			ctx_lhs.strokeRect(1.5, lhs_y_start, 4.5, Math.max(lhs_y_end - lhs_y_start, 5));
 
 			ctx_rhs.beginPath();
-			ctx_rhs.fillStyle = this.settings.fgcolor[(this._current_diff==i?'c':'')+change['op']];
+			ctx_rhs.fillStyle = fill;
 			ctx_rhs.strokeStyle = '#000';
 			ctx_rhs.lineWidth = 0.5;
 			ctx_rhs.fillRect(1.5, rhs_y_start, 4.5, Math.max(rhs_y_end - rhs_y_start, 5));
@@ -1463,7 +1526,7 b' jQuery.extend(Mgly.CodeMirrorDiffView.pr'
 
 			// draw left box
 			ctx.beginPath();
-			ctx.strokeStyle = this.settings.fgcolor[(this._current_diff==i?'c':'')+change['op']];
+			ctx.strokeStyle = fill;
 			ctx.lineWidth = (this._current_diff==i) ? 1.5 : 1;
 
 			var rectWidth = this.draw_lhs_width;

rhodecode/public/js/mode/clike/clike.js

@@ -25,8 +25,12 b' CodeMirror.defineMode("clike", function('
       multiLineStrings = parserConfig.multiLineStrings,
       indentStatements = parserConfig.indentStatements !== false,
       indentSwitch = parserConfig.indentSwitch !== false,
-      namespaceSeparator = parserConfig.namespaceSeparator;
-  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
+      namespaceSeparator = parserConfig.namespaceSeparator,
+      isPunctuationChar = parserConfig.isPunctuationChar || /[\[\]{}\(\),;\:\.]/,
+      numberStart = parserConfig.numberStart || /[\d\.]/,
+      number = parserConfig.number || /^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,
+      isOperatorChar = parserConfig.isOperatorChar || /[+\-*&%=<>!?|\/]/,
+      endStatement = parserConfig.endStatement || /^[;:,]$/;
 
   var curPunc, isDefKeyword;
 
@@ -40,13 +44,14 b' CodeMirror.defineMode("clike", function('
       state.tokenize = tokenString(ch);
       return state.tokenize(stream, state);
     }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+    if (isPunctuationChar.test(ch)) {
       curPunc = ch;
       return null;
     }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
+    if (numberStart.test(ch)) {
+      stream.backUp(1)
+      if (stream.match(number)) return "number"
+      stream.next()
     }
     if (ch == "/") {
       if (stream.eat("*")) {
@@ -67,17 +72,17 b' CodeMirror.defineMode("clike", function('
       stream.eatWhile(/[\w\$_\xa1-\uffff]/);
 
     var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      if (defKeywords.propertyIsEnumerable(cur)) isDefKeyword = true;
+    if (contains(keywords, cur)) {
+      if (contains(blockKeywords, cur)) curPunc = "newstatement";
+      if (contains(defKeywords, cur)) isDefKeyword = true;
       return "keyword";
     }
-    if (types.propertyIsEnumerable(cur)) return "variable-3";
-    if (builtin.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+    if (contains(types, cur)) return "variable-3";
+    if (contains(builtin, cur)) {
+      if (contains(blockKeywords, cur)) curPunc = "newstatement";
       return "builtin";
     }
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
+    if (contains(atoms, cur)) return "atom";
     return "variable";
   }
 
@@ -168,8 +173,7 b' CodeMirror.defineMode("clike", function('
       if (style == "comment" || style == "meta") return style;
       if (ctx.align == null) ctx.align = true;
 
-      if ((curPunc == ";" || curPunc == ":" || curPunc == ","))
-        while (isStatement(state.context.type)) popContext(state);
+      if (endStatement.test(curPunc)) while (isStatement(state.context.type)) popContext(state);
       else if (curPunc == "{") pushContext(state, stream.column(), "}");
       else if (curPunc == "[") pushContext(state, stream.column(), "]");
       else if (curPunc == "(") pushContext(state, stream.column(), ")");
@@ -212,8 +216,16 b' CodeMirror.defineMode("clike", function('
       if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
       if (isStatement(ctx.type) && firstChar == "}") ctx = ctx.prev;
+      if (hooks.indent) {
+        var hook = hooks.indent(state, ctx, textAfter);
+        if (typeof hook == "number") return hook
+      }
       var closing = firstChar == ctx.type;
       var switchBlock = ctx.prev && ctx.prev.type == "switchstatement";
+      if (parserConfig.allmanIndentation && /[{(]/.test(firstChar)) {
+        while (ctx.type != "top" && ctx.type != "}") ctx = ctx.prev
+        return ctx.indented
+      }
       if (isStatement(ctx.type))
         return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
       if (ctx.align && (!dontAlignCalls || ctx.type != ")"))
@@ -238,27 +250,30 b' CodeMirror.defineMode("clike", function('
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
     return obj;
   }
+  function contains(words, word) {
+    if (typeof words === "function") {
+      return words(word);
+    } else {
+      return words.propertyIsEnumerable(word);
+    }
+  }
   var cKeywords = "auto if break case register continue return default do sizeof " +
-    "static else struct switch extern typedef float union for " +
-    "goto while enum const volatile";
+    "static else struct switch extern typedef union for goto while enum const volatile";
   var cTypes = "int long char short double float unsigned signed void size_t ptrdiff_t";
 
   function cppHook(stream, state) {
-    if (!state.startOfLine) return false;
-    for (;;) {
-      if (stream.skipTo("\\")) {
-        stream.next();
-        if (stream.eol()) {
-          state.tokenize = cppHook;
-          break;
-        }
-      } else {
-        stream.skipToEnd();
-        state.tokenize = null;
-        break;
+    if (!state.startOfLine) return false
+    for (var ch, next = null; ch = stream.peek();) {
+      if (ch == "\\" && stream.match(/^.$/)) {
+        next = cppHook
+        break
+      } else if (ch == "/" && stream.match(/^\/[\/\*]/, false)) {
+        break
       }
+      stream.next()
     }
-    return "meta";
+    state.tokenize = next
+    return "meta"
   }
 
   function pointerHook(_stream, state) {
@@ -266,6 +281,11 b' CodeMirror.defineMode("clike", function('
     return false;
   }
 
+  function cpp14Literal(stream) {
+    stream.eatWhile(/[\w\.']/);
+    return "number";
+  }
+
   function cpp11StringHook(stream, state) {
     stream.backUp(1);
     // Raw strings.
@@ -373,6 +393,16 b' CodeMirror.defineMode("clike", function('
       "U": cpp11StringHook,
       "L": cpp11StringHook,
       "R": cpp11StringHook,
+      "0": cpp14Literal,
+      "1": cpp14Literal,
+      "2": cpp14Literal,
+      "3": cpp14Literal,
+      "4": cpp14Literal,
+      "5": cpp14Literal,
+      "6": cpp14Literal,
+      "7": cpp14Literal,
+      "8": cpp14Literal,
+      "9": cpp14Literal,
       token: function(stream, state, style) {
         if (style == "variable" && stream.peek() == "(" &&
             (state.prevToken == ";" || state.prevToken == null ||
@@ -398,6 +428,7 b' CodeMirror.defineMode("clike", function('
     defKeywords: words("class interface package enum"),
     typeFirstDefinitions: true,
     atoms: words("true false null"),
+    endStatement: /^[;:]$/,
     hooks: {
       "@": function(stream) {
         stream.eatWhile(/[\w\$_]/);
@@ -453,7 +484,7 b' CodeMirror.defineMode("clike", function('
     keywords: words(
 
       /* scala */
-      "abstract case catch class def do else extends false final finally for forSome if " +
+      "abstract case catch class def do else extends final finally for forSome if " +
       "implicit import lazy match new null object override package private protected return " +
       "sealed super this throw trait try type val var while with yield _ : = => <- <: " +
       "<% >: # @ " +
@@ -501,6 +532,59 b' CodeMirror.defineMode("clike", function('
     modeProps: {closeBrackets: {triples: '"'}}
   });
 
+  function tokenKotlinString(tripleString){
+    return function (stream, state) {
+      var escaped = false, next, end = false;
+      while (!stream.eol()) {
+        if (!tripleString && !escaped && stream.match('"') ) {end = true; break;}
+        if (tripleString && stream.match('"""')) {end = true; break;}
+        next = stream.next();
+        if(!escaped && next == "$" && stream.match('{'))
+          stream.skipTo("}");
+        escaped = !escaped && next == "\\" && !tripleString;
+      }
+      if (end || !tripleString)
+        state.tokenize = null;
+      return "string";
+    }
+  }
+
+  def("text/x-kotlin", {
+    name: "clike",
+    keywords: words(
+      /*keywords*/
+      "package as typealias class interface this super val " +
+      "var fun for is in This throw return " +
+      "break continue object if else while do try when !in !is as? " +
+
+      /*soft keywords*/
+      "file import where by get set abstract enum open inner override private public internal " +
+      "protected catch finally out final vararg reified dynamic companion constructor init " +
+      "sealed field property receiver param sparam lateinit data inline noinline tailrec " +
+      "external annotation crossinline const operator infix"
+    ),
+    types: words(
+      /* package java.lang */
+      "Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable " +
+      "Compiler Double Exception Float Integer Long Math Number Object Package Pair Process " +
+      "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " +
+      "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
+    ),
+    intendSwitch: false,
+    indentStatements: false,
+    multiLineStrings: true,
+    blockKeywords: words("catch class do else finally for if where try while enum"),
+    defKeywords: words("class val var object package interface fun"),
+    atoms: words("true false null this"),
+    hooks: {
+      '"': function(stream, state) {
+        state.tokenize = tokenKotlinString(stream.match('""'));
+        return state.tokenize(stream, state);
+      }
+    },
+    modeProps: {closeBrackets: {triples: '"'}}
+  });
+
   def(["x-shader/x-vertex", "x-shader/x-fragment"], {
     name: "clike",
     keywords: words("sampler1D sampler2D sampler3D samplerCube " +
@@ -583,9 +667,106 b' CodeMirror.defineMode("clike", function('
         stream.eatWhile(/[\w\$]/);
         return "keyword";
       },
-      "#": cppHook
+      "#": cppHook,
+      indent: function(_state, ctx, textAfter) {
+        if (ctx.type == "statement" && /^@\w/.test(textAfter)) return ctx.indented
+      }
     },
     modeProps: {fold: "brace"}
   });
 
+  def("text/x-squirrel", {
+    name: "clike",
+    keywords: words("base break clone continue const default delete enum extends function in class" +
+                    " foreach local resume return this throw typeof yield constructor instanceof static"),
+    types: words(cTypes),
+    blockKeywords: words("case catch class else for foreach if switch try while"),
+    defKeywords: words("function local class"),
+    typeFirstDefinitions: true,
+    atoms: words("true false null"),
+    hooks: {"#": cppHook},
+    modeProps: {fold: ["brace", "include"]}
+  });
+
+  // Ceylon Strings need to deal with interpolation
+  var stringTokenizer = null;
+  function tokenCeylonString(type) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while (!stream.eol()) {
+        if (!escaped && stream.match('"') &&
+              (type == "single" || stream.match('""'))) {
+          end = true;
+          break;
+        }
+        if (!escaped && stream.match('``')) {
+          stringTokenizer = tokenCeylonString(type);
+          end = true;
+          break;
+        }
+        next = stream.next();
+        escaped = type == "single" && !escaped && next == "\\";
+      }
+      if (end)
+          state.tokenize = null;
+      return "string";
+    }
+  }
+
+  def("text/x-ceylon", {
+    name: "clike",
+    keywords: words("abstracts alias assembly assert assign break case catch class continue dynamic else" +
+                    " exists extends finally for function given if import in interface is let module new" +
+                    " nonempty object of out outer package return satisfies super switch then this throw" +
+                    " try value void while"),
+    types: function(word) {
+        // In Ceylon all identifiers that start with an uppercase are types
+        var first = word.charAt(0);
+        return (first === first.toUpperCase() && first !== first.toLowerCase());
+    },
+    blockKeywords: words("case catch class dynamic else finally for function if interface module new object switch try while"),
+    defKeywords: words("class dynamic function interface module object package value"),
+    builtin: words("abstract actual aliased annotation by default deprecated doc final formal late license" +
+                   " native optional sealed see serializable shared suppressWarnings tagged throws variable"),
+    isPunctuationChar: /[\[\]{}\(\),;\:\.`]/,
+    isOperatorChar: /[+\-*&%=<>!?|^~:\/]/,
+    numberStart: /[\d#$]/,
+    number: /^(?:#[\da-fA-F_]+|\$[01_]+|[\d_]+[kMGTPmunpf]?|[\d_]+\.[\d_]+(?:[eE][-+]?\d+|[kMGTPmunpf]|)|)/i,
+    multiLineStrings: true,
+    typeFirstDefinitions: true,
+    atoms: words("true false null larger smaller equal empty finished"),
+    indentSwitch: false,
+    styleDefs: false,
+    hooks: {
+      "@": function(stream) {
+        stream.eatWhile(/[\w\$_]/);
+        return "meta";
+      },
+      '"': function(stream, state) {
+          state.tokenize = tokenCeylonString(stream.match('""') ? "triple" : "single");
+          return state.tokenize(stream, state);
+        },
+      '`': function(stream, state) {
+          if (!stringTokenizer || !stream.match('`')) return false;
+          state.tokenize = stringTokenizer;
+          stringTokenizer = null;
+          return state.tokenize(stream, state);
+        },
+      "'": function(stream) {
+        stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+        return "atom";
+      },
+      token: function(_stream, state, style) {
+          if ((style == "variable" || style == "variable-3") &&
+              state.prevToken == ".") {
+            return "variable-2";
+          }
+        }
+    },
+    modeProps: {
+        fold: ["brace", "import"],
+        closeBrackets: {triples: '"'}
+    }
+  });
+
 });

rhodecode/public/js/mode/clojure/clojure.js

@@ -59,7 +59,8 b' CodeMirror.defineMode("clojure", functio'
         sign: /[+-]/,
         exponent: /e/i,
         keyword_char: /[^\s\(\[\;\)\]]/,
-        symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/
+        symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/,
+        block_indent: /^(?:def|with)[^\/]+$|\/(?:def|with)/
     };
 
     function stateStack(indent, type, prev) { // represents a state stack object
@@ -96,6 +97,9 b' CodeMirror.defineMode("clojure", functio'
             if ( '.' == stream.peek() ) {
                 stream.eat('.');
                 stream.eatWhile(tests.digit);
+            } else if ('/' == stream.peek() ) {
+                stream.eat('/');
+                stream.eatWhile(tests.digit);
             }
 
             if ( stream.eat(tests.exponent) ) {
@@ -139,7 +143,7 b' CodeMirror.defineMode("clojure", functio'
             }
 
             // skip spaces
-            if (stream.eatSpace()) {
+            if (state.mode != "string" && stream.eatSpace()) {
                 return null;
             }
             var returnType = null;
@@ -187,7 +191,7 b' CodeMirror.defineMode("clojure", functio'
                         }
 
                         if (keyWord.length > 0 && (indentKeys.propertyIsEnumerable(keyWord) ||
-                                                   /^(?:def|with)/.test(keyWord))) { // indent-word
+                                                   tests.block_indent.test(keyWord))) { // indent-word
                             pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
                         } else { // non-indent word
                             // we continue eating the spaces
@@ -240,5 +244,6 b' CodeMirror.defineMode("clojure", functio'
 });
 
 CodeMirror.defineMIME("text/x-clojure", "clojure");
+CodeMirror.defineMIME("text/x-clojurescript", "clojure");
 
 });

rhodecode/public/js/mode/coffeescript/coffeescript.js

@@ -25,7 +25,7 b' CodeMirror.defineMode("coffeescript", fu'
   var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?|(or|and|\|\||&&|\?)=)/;
   var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/;
   var identifiers = /^[_A-Za-z$][_A-Za-z$0-9]*/;
-  var properties = /^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/;
+  var atProp = /^@[_A-Za-z$][_A-Za-z$0-9]*/;
 
   var wordOperators = wordRegexp(["and", "or", "not",
                                   "is", "isnt", "in",
@@ -145,6 +145,8 b' CodeMirror.defineMode("coffeescript", fu'
       }
     }
 
+
+
     // Handle operators and delimiters
     if (stream.match(operators) || stream.match(wordOperators)) {
       return "operator";
@@ -157,6 +159,10 b' CodeMirror.defineMode("coffeescript", fu'
       return "atom";
     }
 
+    if (stream.match(atProp) || state.prop && stream.match(identifiers)) {
+      return "property";
+    }
+
     if (stream.match(keywords)) {
       return "keyword";
     }
@@ -165,10 +171,6 b' CodeMirror.defineMode("coffeescript", fu'
       return "variable";
     }
 
-    if (stream.match(properties)) {
-      return "property";
-    }
-
     // Handle non-detected items
     stream.next();
     return ERRORCLASS;
@@ -265,24 +267,11 b' CodeMirror.defineMode("coffeescript", fu'
     var style = state.tokenize(stream, state);
     var current = stream.current();
 
-    // Handle "." connected identifiers
-    if (current === ".") {
-      style = state.tokenize(stream, state);
-      current = stream.current();
-      if (/^\.[\w$]+$/.test(current)) {
-        return "variable";
-      } else {
-        return ERRORCLASS;
-      }
-    }
-
     // Handle scope changes.
     if (current === "return") {
       state.dedent = true;
     }
-    if (((current === "->" || current === "=>") &&
-         !state.lambda &&
-         !stream.peek())
+    if (((current === "->" || current === "=>") && stream.eol())
         || style === "indent") {
       indent(stream, state);
     }
@@ -324,8 +313,7 b' CodeMirror.defineMode("coffeescript", fu'
       return {
         tokenize: tokenBase,
         scope: {offset:basecolumn || 0, type:"coffee", prev: null, align: false},
-        lastToken: null,
-        lambda: false,
+        prop: false,
         dedent: 0
       };
     },
@@ -335,12 +323,9 b' CodeMirror.defineMode("coffeescript", fu'
       if (fillAlign && stream.sol()) fillAlign.align = false;
 
       var style = tokenLexer(stream, state);
-      if (fillAlign && style && style != "comment") fillAlign.align = true;
-
-      state.lastToken = {style:style, content: stream.current()};
-
-      if (stream.eol() && stream.lambda) {
-        state.lambda = false;
+      if (style && style != "comment") {
+        if (fillAlign) fillAlign.align = true;
+        state.prop = style == "punctuation" && stream.current() == "."
       }
 
       return style;
@@ -365,5 +350,6 b' CodeMirror.defineMode("coffeescript", fu'
 });
 
 CodeMirror.defineMIME("text/x-coffeescript", "coffeescript");
+CodeMirror.defineMIME("text/coffeescript", "coffeescript");
 
 });

rhodecode/public/js/mode/css/css.js

@@ -12,6 +12,7 b''
 "use strict";
 
 CodeMirror.defineMode("css", function(config, parserConfig) {
+  var inline = parserConfig.inline
   if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
 
   var indentUnit = config.indentUnit,
@@ -19,13 +20,15 b' CodeMirror.defineMode("css", function(co'
       documentTypes = parserConfig.documentTypes || {},
       mediaTypes = parserConfig.mediaTypes || {},
       mediaFeatures = parserConfig.mediaFeatures || {},
+      mediaValueKeywords = parserConfig.mediaValueKeywords || {},
       propertyKeywords = parserConfig.propertyKeywords || {},
       nonStandardPropertyKeywords = parserConfig.nonStandardPropertyKeywords || {},
       fontProperties = parserConfig.fontProperties || {},
       counterDescriptors = parserConfig.counterDescriptors || {},
       colorKeywords = parserConfig.colorKeywords || {},
       valueKeywords = parserConfig.valueKeywords || {},
-      allowNested = parserConfig.allowNested;
+      allowNested = parserConfig.allowNested,
+      supportsAtComponent = parserConfig.supportsAtComponent === true;
 
   var type, override;
   function ret(style, tp) { type = tp; return style; }
@@ -119,13 +122,14 b' CodeMirror.defineMode("css", function(co'
     this.prev = prev;
   }
 
-  function pushContext(state, stream, type) {
-    state.context = new Context(type, stream.indentation() + indentUnit, state.context);
+  function pushContext(state, stream, type, indent) {
+    state.context = new Context(type, stream.indentation() + (indent === false ? 0 : indentUnit), state.context);
     return type;
   }
 
   function popContext(state) {
-    state.context = state.context.prev;
+    if (state.context.prev)
+      state.context = state.context.prev;
     return state.context.type;
   }
 
@@ -157,9 +161,13 b' CodeMirror.defineMode("css", function(co'
       return pushContext(state, stream, "block");
     } else if (type == "}" && state.context.prev) {
       return popContext(state);
-    } else if (/@(media|supports|(-moz-)?document)/.test(type)) {
+    } else if (supportsAtComponent && /@component/.test(type)) {
+      return pushContext(state, stream, "atComponentBlock");
+    } else if (/^@(-moz-)?document$/.test(type)) {
+      return pushContext(state, stream, "documentTypes");
+    } else if (/^@(media|supports|(-moz-)?document|import)$/.test(type)) {
       return pushContext(state, stream, "atBlock");
-    } else if (/@(font-face|counter-style)/.test(type)) {
+    } else if (/^@(font-face|counter-style)/.test(type)) {
       state.stateArg = type;
       return "restricted_atBlock_before";
     } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
@@ -219,7 +227,7 b' CodeMirror.defineMode("css", function(co'
     if (type == "}" || type == "{") return popAndPass(type, stream, state);
     if (type == "(") return pushContext(state, stream, "parens");
 
-    if (type == "hash" && !/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) {
+    if (type == "hash" && !/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(stream.current())) {
       override += " error";
     } else if (type == "word") {
       wordAsValue(stream);
@@ -252,33 +260,56 b' CodeMirror.defineMode("css", function(co'
     return pass(type, stream, state);
   };
 
+  states.documentTypes = function(type, stream, state) {
+    if (type == "word" && documentTypes.hasOwnProperty(stream.current())) {
+      override = "tag";
+      return state.context.type;
+    } else {
+      return states.atBlock(type, stream, state);
+    }
+  };
+
   states.atBlock = function(type, stream, state) {
     if (type == "(") return pushContext(state, stream, "atBlock_parens");
-    if (type == "}") return popAndPass(type, stream, state);
+    if (type == "}" || type == ";") return popAndPass(type, stream, state);
     if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top");
 
+    if (type == "interpolation") return pushContext(state, stream, "interpolation");
+
     if (type == "word") {
       var word = stream.current().toLowerCase();
       if (word == "only" || word == "not" || word == "and" || word == "or")
         override = "keyword";
-      else if (documentTypes.hasOwnProperty(word))
-        override = "tag";
       else if (mediaTypes.hasOwnProperty(word))
         override = "attribute";
       else if (mediaFeatures.hasOwnProperty(word))
         override = "property";
+      else if (mediaValueKeywords.hasOwnProperty(word))
+        override = "keyword";
       else if (propertyKeywords.hasOwnProperty(word))
         override = "property";
       else if (nonStandardPropertyKeywords.hasOwnProperty(word))
         override = "string-2";
       else if (valueKeywords.hasOwnProperty(word))
         override = "atom";
+      else if (colorKeywords.hasOwnProperty(word))
+        override = "keyword";
       else
         override = "error";
     }
     return state.context.type;
   };
 
+  states.atComponentBlock = function(type, stream, state) {
+    if (type == "}")
+      return popAndPass(type, stream, state);
+    if (type == "{")
+      return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top", false);
+    if (type == "word")
+      override = "error";
+    return state.context.type;
+  };
+
   states.atBlock_parens = function(type, stream, state) {
     if (type == ")") return popContext(state);
     if (type == "{" || type == "}") return popAndPass(type, stream, state, 2);
@@ -336,9 +367,9 b' CodeMirror.defineMode("css", function(co'
   return {
     startState: function(base) {
       return {tokenize: null,
-              state: "top",
+              state: inline ? "block" : "top",
               stateArg: null,
-              context: new Context("top", base || 0, null)};
+              context: new Context(inline ? "block" : "top", base || 0, null)};
     },
 
     token: function(stream, state) {
@@ -357,12 +388,18 b' CodeMirror.defineMode("css", function(co'
       var cx = state.context, ch = textAfter && textAfter.charAt(0);
       var indent = cx.indent;
       if (cx.type == "prop" && (ch == "}" || ch == ")")) cx = cx.prev;
-      if (cx.prev &&
-          (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation" || cx.type == "restricted_atBlock") ||
-           ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
-           ch == "{" && (cx.type == "at" || cx.type == "atBlock"))) {
-        indent = cx.indent - indentUnit;
-        cx = cx.prev;
+      if (cx.prev) {
+        if (ch == "}" && (cx.type == "block" || cx.type == "top" ||
+                          cx.type == "interpolation" || cx.type == "restricted_atBlock")) {
+          // Resume indentation from parent context.
+          cx = cx.prev;
+          indent = cx.indent;
+        } else if (ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
+            ch == "{" && (cx.type == "at" || cx.type == "atBlock")) {
+          // Dedent relative to current context.
+          indent = Math.max(0, cx.indent - indentUnit);
+          cx = cx.prev;
+        }
       }
       return indent;
     },
@@ -399,17 +436,24 b' CodeMirror.defineMode("css", function(co'
     "min-device-aspect-ratio", "max-device-aspect-ratio", "color", "min-color",
     "max-color", "color-index", "min-color-index", "max-color-index",
     "monochrome", "min-monochrome", "max-monochrome", "resolution",
-    "min-resolution", "max-resolution", "scan", "grid"
+    "min-resolution", "max-resolution", "scan", "grid", "orientation",
+    "device-pixel-ratio", "min-device-pixel-ratio", "max-device-pixel-ratio",
+    "pointer", "any-pointer", "hover", "any-hover"
   ], mediaFeatures = keySet(mediaFeatures_);
 
+  var mediaValueKeywords_ = [
+    "landscape", "portrait", "none", "coarse", "fine", "on-demand", "hover",
+    "interlace", "progressive"
+  ], mediaValueKeywords = keySet(mediaValueKeywords_);
+
   var propertyKeywords_ = [
     "align-content", "align-items", "align-self", "alignment-adjust",
     "alignment-baseline", "anchor-point", "animation", "animation-delay",
     "animation-direction", "animation-duration", "animation-fill-mode",
     "animation-iteration-count", "animation-name", "animation-play-state",
     "animation-timing-function", "appearance", "azimuth", "backface-visibility",
-    "background", "background-attachment", "background-clip", "background-color",
-    "background-image", "background-origin", "background-position",
+    "background", "background-attachment", "background-blend-mode", "background-clip",
+    "background-color", "background-image", "background-origin", "background-position",
     "background-repeat", "background-size", "baseline-shift", "binding",
     "bleed", "bookmark-label", "bookmark-level", "bookmark-state",
     "bookmark-target", "border", "border-bottom", "border-bottom-color",
@@ -553,11 +597,12 b' CodeMirror.defineMode("css", function(co'
     "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
     "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
     "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
-    "col-resize", "collapse", "column", "compact", "condensed", "contain", "content",
+    "col-resize", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse",
+    "compact", "condensed", "contain", "content",
     "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
-    "cross", "crosshair", "currentcolor", "cursive", "cyclic", "dashed", "decimal",
+    "cross", "crosshair", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
     "decimal-leading-zero", "default", "default-button", "destination-atop",
-    "destination-in", "destination-out", "destination-over", "devanagari",
+    "destination-in", "destination-out", "destination-over", "devanagari", "difference",
     "disc", "discard", "disclosure-closed", "disclosure-open", "document",
     "dot-dash", "dot-dot-dash",
     "dotted", "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
@@ -568,23 +613,23 b' CodeMirror.defineMode("css", function(co'
     "ethiopic-halehame-gez", "ethiopic-halehame-om-et",
     "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
     "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
-    "ethiopic-numeric", "ew-resize", "expanded", "extends", "extra-condensed",
-    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "footnotes",
+    "ethiopic-numeric", "ew-resize", "exclusion", "expanded", "extends", "extra-condensed",
+    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
     "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove",
-    "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hebrew",
+    "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hard-light", "hebrew",
     "help", "hidden", "hide", "higher", "highlight", "highlighttext",
-    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "icon", "ignore",
+    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "hue", "icon", "ignore",
     "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
     "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
     "inline-block", "inline-flex", "inline-table", "inset", "inside", "intrinsic", "invert",
     "italic", "japanese-formal", "japanese-informal", "justify", "kannada",
     "katakana", "katakana-iroha", "keep-all", "khmer",
     "korean-hangul-formal", "korean-hanja-formal", "korean-hanja-informal",
-    "landscape", "lao", "large", "larger", "left", "level", "lighter",
+    "landscape", "lao", "large", "larger", "left", "level", "lighter", "lighten",
     "line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem",
     "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
     "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
-    "lower-roman", "lowercase", "ltr", "malayalam", "match", "matrix", "matrix3d",
+    "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "match", "matrix", "matrix3d",
     "media-controls-background", "media-current-time-display",
     "media-fullscreen-button", "media-mute-button", "media-play-button",
     "media-return-to-realtime-button", "media-rewind-button",
@@ -593,7 +638,7 b' CodeMirror.defineMode("css", function(co'
     "media-volume-slider-container", "media-volume-sliderthumb", "medium",
     "menu", "menulist", "menulist-button", "menulist-text",
     "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic",
-    "mix", "mongolian", "monospace", "move", "multiple", "myanmar", "n-resize",
+    "mix", "mongolian", "monospace", "move", "multiple", "multiply", "myanmar", "n-resize",
     "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
     "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
     "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
@@ -606,8 +651,8 b' CodeMirror.defineMode("css", function(co'
     "relative", "repeat", "repeating-linear-gradient",
     "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse",
     "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
-    "rotateZ", "round", "row-resize", "rtl", "run-in", "running",
-    "s-resize", "sans-serif", "scale", "scale3d", "scaleX", "scaleY", "scaleZ",
+    "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
+    "s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
     "scroll", "scrollbar", "se-resize", "searchfield",
     "searchfield-cancel-button", "searchfield-decoration",
     "searchfield-results-button", "searchfield-results-decoration",
@@ -615,8 +660,8 b' CodeMirror.defineMode("css", function(co'
     "simp-chinese-formal", "simp-chinese-informal", "single",
     "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
     "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
-    "small", "small-caps", "small-caption", "smaller", "solid", "somali",
-    "source-atop", "source-in", "source-out", "source-over", "space", "spell-out", "square",
+    "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
+    "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "spell-out", "square",
     "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
     "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "table",
     "table-caption", "table-cell", "table-column", "table-column-group",
@@ -633,12 +678,13 b' CodeMirror.defineMode("css", function(co'
     "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
     "var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
     "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
-    "window", "windowframe", "windowtext", "words", "x-large", "x-small", "xor",
+    "window", "windowframe", "windowtext", "words", "wrap", "wrap-reverse", "x-large", "x-small", "xor",
     "xx-large", "xx-small"
   ], valueKeywords = keySet(valueKeywords_);
 
-  var allWords = documentTypes_.concat(mediaTypes_).concat(mediaFeatures_).concat(propertyKeywords_)
-    .concat(nonStandardPropertyKeywords_).concat(colorKeywords_).concat(valueKeywords_);
+  var allWords = documentTypes_.concat(mediaTypes_).concat(mediaFeatures_).concat(mediaValueKeywords_)
+    .concat(propertyKeywords_).concat(nonStandardPropertyKeywords_).concat(colorKeywords_)
+    .concat(valueKeywords_);
   CodeMirror.registerHelper("hintWords", "css", allWords);
 
   function tokenCComment(stream, state) {
@@ -657,6 +703,7 b' CodeMirror.defineMode("css", function(co'
     documentTypes: documentTypes,
     mediaTypes: mediaTypes,
     mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
     propertyKeywords: propertyKeywords,
     nonStandardPropertyKeywords: nonStandardPropertyKeywords,
     fontProperties: fontProperties,
@@ -676,6 +723,7 b' CodeMirror.defineMode("css", function(co'
   CodeMirror.defineMIME("text/x-scss", {
     mediaTypes: mediaTypes,
     mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
     propertyKeywords: propertyKeywords,
     nonStandardPropertyKeywords: nonStandardPropertyKeywords,
     colorKeywords: colorKeywords,
@@ -717,6 +765,7 b' CodeMirror.defineMode("css", function(co'
   CodeMirror.defineMIME("text/x-less", {
     mediaTypes: mediaTypes,
     mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
     propertyKeywords: propertyKeywords,
     nonStandardPropertyKeywords: nonStandardPropertyKeywords,
     colorKeywords: colorKeywords,
@@ -751,4 +800,26 b' CodeMirror.defineMode("css", function(co'
     helperType: "less"
   });
 
+  CodeMirror.defineMIME("text/x-gss", {
+    documentTypes: documentTypes,
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    fontProperties: fontProperties,
+    counterDescriptors: counterDescriptors,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    supportsAtComponent: true,
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false;
+        state.tokenize = tokenCComment;
+        return tokenCComment(stream, state);
+      }
+    },
+    name: "css",
+    helperType: "gss"
+  });
+
 });

rhodecode/public/js/mode/cypher/cypher.js

@@ -60,9 +60,9 b''
     };
     var indentUnit = config.indentUnit;
     var curPunc;
-    var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]);
-    var preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor"]);
-    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
+    var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "reverse", "right", "round", "rtrim", "shortestPath", "sign", "sin", "size", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "toString", "trim", "type", "upper"]);
+    var preds = wordRegexp(["all", "and", "any", "contains", "exists", "has", "in", "none", "not", "or", "single", "xor"]);
+    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "detach", "distinct", "drop", "else", "end", "ends", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "starts", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
     var operatorChars = /[*+\-<>=&|~%^]/;
 
     return {

rhodecode/public/js/mode/dart/dart.js

@@ -15,7 +15,7 b''
     "implements get native operator set typedef with enum throw rethrow " +
     "assert break case continue default in return new deferred async await " +
     "try catch finally do else for if switch while import library export " +
-    "part of show hide is").split(" ");
+    "part of show hide is as").split(" ");
   var blockKeywords = "try catch finally do else for if switch while".split(" ");
   var atoms = "true false null".split(" ");
   var builtins = "void bool num int double dynamic var String".split(" ");
@@ -26,21 +26,101 b''
     return obj;
   }
 
+  function pushInterpolationStack(state) {
+    (state.interpolationStack || (state.interpolationStack = [])).push(state.tokenize);
+  }
+
+  function popInterpolationStack(state) {
+    return (state.interpolationStack || (state.interpolationStack = [])).pop();
+  }
+
+  function sizeInterpolationStack(state) {
+    return state.interpolationStack ? state.interpolationStack.length : 0;
+  }
+
   CodeMirror.defineMIME("application/dart", {
     name: "clike",
     keywords: set(keywords),
-    multiLineStrings: true,
     blockKeywords: set(blockKeywords),
     builtin: set(builtins),
     atoms: set(atoms),
     hooks: {
       "@": function(stream) {
-        stream.eatWhile(/[\w\$_]/);
+        stream.eatWhile(/[\w\$_\.]/);
         return "meta";
+      },
+
+      // custom string handling to deal with triple-quoted strings and string interpolation
+      "'": function(stream, state) {
+        return tokenString("'", stream, state, false);
+      },
+      "\"": function(stream, state) {
+        return tokenString("\"", stream, state, false);
+      },
+      "r": function(stream, state) {
+        var peek = stream.peek();
+        if (peek == "'" || peek == "\"") {
+          return tokenString(stream.next(), stream, state, true);
+        }
+        return false;
+      },
+
+      "}": function(_stream, state) {
+        // "}" is end of interpolation, if interpolation stack is non-empty
+        if (sizeInterpolationStack(state) > 0) {
+          state.tokenize = popInterpolationStack(state);
+          return null;
+        }
+        return false;
       }
     }
   });
 
+  function tokenString(quote, stream, state, raw) {
+    var tripleQuoted = false;
+    if (stream.eat(quote)) {
+      if (stream.eat(quote)) tripleQuoted = true;
+      else return "string"; //empty string
+    }
+    function tokenStringHelper(stream, state) {
+      var escaped = false;
+      while (!stream.eol()) {
+        if (!raw && !escaped && stream.peek() == "$") {
+          pushInterpolationStack(state);
+          state.tokenize = tokenInterpolation;
+          return "string";
+        }
+        var next = stream.next();
+        if (next == quote && !escaped && (!tripleQuoted || stream.match(quote + quote))) {
+          state.tokenize = null;
+          break;
+        }
+        escaped = !raw && !escaped && next == "\\";
+      }
+      return "string";
+    }
+    state.tokenize = tokenStringHelper;
+    return tokenStringHelper(stream, state);
+  }
+
+  function tokenInterpolation(stream, state) {
+    stream.eat("$");
+    if (stream.eat("{")) {
+      // let clike handle the content of ${...},
+      // we take over again when "}" appears (see hooks).
+      state.tokenize = null;
+    } else {
+      state.tokenize = tokenInterpolationIdentifier;
+    }
+    return null;
+  }
+
+  function tokenInterpolationIdentifier(stream, state) {
+    stream.eatWhile(/[\w_]/);
+    state.tokenize = popInterpolationStack(state);
+    return "variable";
+  }
+
   CodeMirror.registerHelper("hintWords", "application/dart", keywords.concat(atoms).concat(builtins));
 
   // This is needed to make loading through meta.js work.

rhodecode/public/js/mode/django/django.js

@@ -14,14 +14,14 b''
   "use strict";
 
   CodeMirror.defineMode("django:inner", function() {
-    var keywords = ["block", "endblock", "for", "endfor", "true", "false",
-                    "loop", "none", "self", "super", "if", "endif", "as",
-                    "else", "import", "with", "endwith", "without", "context", "ifequal", "endifequal",
-                    "ifnotequal", "endifnotequal", "extends", "include", "load", "comment",
-                    "endcomment", "empty", "url", "static", "trans", "blocktrans", "now", "regroup",
-                    "lorem", "ifchanged", "endifchanged", "firstof", "debug", "cycle", "csrf_token",
-                    "autoescape", "endautoescape", "spaceless", "ssi", "templatetag",
-                    "verbatim", "endverbatim", "widthratio"],
+    var keywords = ["block", "endblock", "for", "endfor", "true", "false", "filter", "endfilter",
+                    "loop", "none", "self", "super", "if", "elif", "endif", "as", "else", "import",
+                    "with", "endwith", "without", "context", "ifequal", "endifequal", "ifnotequal",
+                    "endifnotequal", "extends", "include", "load", "comment", "endcomment",
+                    "empty", "url", "static", "trans", "blocktrans", "endblocktrans", "now",
+                    "regroup", "lorem", "ifchanged", "endifchanged", "firstof", "debug", "cycle",
+                    "csrf_token", "autoescape", "endautoescape", "spaceless", "endspaceless",
+                    "ssi", "templatetag", "verbatim", "endverbatim", "widthratio"],
         filters = ["add", "addslashes", "capfirst", "center", "cut", "date",
                    "default", "default_if_none", "dictsort",
                    "dictsortreversed", "divisibleby", "escape", "escapejs",
@@ -35,11 +35,13 b''
                    "truncatechars_html", "truncatewords", "truncatewords_html",
                    "unordered_list", "upper", "urlencode", "urlize",
                    "urlizetrunc", "wordcount", "wordwrap", "yesno"],
-        operators = ["==", "!=", "<", ">", "<=", ">=", "in", "not", "or", "and"];
+        operators = ["==", "!=", "<", ">", "<=", ">="],
+        wordOperators = ["in", "not", "or", "and"];
 
     keywords = new RegExp("^\\b(" + keywords.join("|") + ")\\b");
     filters = new RegExp("^\\b(" + filters.join("|") + ")\\b");
     operators = new RegExp("^\\b(" + operators.join("|") + ")\\b");
+    wordOperators = new RegExp("^\\b(" + wordOperators.join("|") + ")\\b");
 
     // We have to return "null" instead of null, in order to avoid string
     // styling as the default, when using Django templates inside HTML
@@ -59,7 +61,7 b''
 
       // Ignore completely any stream series that do not match the
       // Django template opening tags.
-      while (stream.next() != null && !stream.match("{{", false) && !stream.match("{%", false)) {}
+      while (stream.next() != null && !stream.match(/\{[{%#]/, false)) {}
       return null;
     }
 
@@ -270,6 +272,11 b''
         return "operator";
       }
 
+      // Attempt to match a word operator
+      if (stream.match(wordOperators)) {
+        return "keyword";
+      }
+
       // Attempt to match a keyword
       var keywordMatch = stream.match(keywords);
       if (keywordMatch) {
@@ -310,9 +317,8 b''
 
     // Mark everything as comment inside the tag and the tag itself.
     function inComment (stream, state) {
-      if (stream.match("#}")) {
-        state.tokenize = tokenBase;
-      }
+      if (stream.match(/^.*?#\}/)) state.tokenize = tokenBase
+      else stream.skipToEnd()
       return "comment";
     }
 

rhodecode/public/js/mode/dockerfile/dockerfile.js

@@ -69,7 +69,10 b''
         token: null,
         next: "start"
       }
-    ]
+    ],
+      meta: {
+          lineComment: "#"
+      }
   });
 
   CodeMirror.defineMIME("text/x-dockerfile", "dockerfile");

rhodecode/public/js/mode/elm/elm.js

@@ -202,4 +202,4 b''
   });
 
   CodeMirror.defineMIME("text/x-elm", "elm");
-})();
+});

rhodecode/public/js/mode/erlang/erlang.js

@@ -220,8 +220,6 b' CodeMirror.defineMode("erlang", function'
         }else{
           return rval(state,stream,"function");
         }
-      }else if (is_member(w,operatorAtomWords)) {
-        return rval(state,stream,"operator");
       }else if (lookahead(stream) == ":") {
         if (w == "erlang") {
           return rval(state,stream,"builtin");
@@ -230,8 +228,6 b' CodeMirror.defineMode("erlang", function'
         }
       }else if (is_member(w,["true","false"])) {
         return rval(state,stream,"boolean");
-      }else if (is_member(w,["true","false"])) {
-        return rval(state,stream,"boolean");
       }else{
         return rval(state,stream,"atom");
       }

rhodecode/public/js/mode/gfm/gfm.js

@@ -11,6 +11,8 b''
 })(function(CodeMirror) {
 "use strict";
 
+var urlRE = /^((?:(?:aaas?|about|acap|adiumxtra|af[ps]|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|cap|chrome(?:-extension)?|cid|coap|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-(?:playcontainer|playsingle)|dns|doi|dtn|dvb|ed2k|facetime|feed|file|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|hcp|https?|iax|icap|icon|im|imap|info|ipn|ipp|irc[6s]?|iris(?:\.beep|\.lwz|\.xpc|\.xpcs)?|itms|jar|javascript|jms|keyparc|lastfm|ldaps?|magnet|mailto|maps|market|message|mid|mms|ms-help|msnim|msrps?|mtqp|mumble|mupdate|mvn|news|nfs|nih?|nntp|notes|oid|opaquelocktoken|palm|paparazzi|platform|pop|pres|proxy|psyc|query|res(?:ource)?|rmi|rsync|rtmp|rtsp|secondlife|service|session|sftp|sgn|shttp|sieve|sips?|skype|sm[bs]|snmp|soap\.beeps?|soldat|spotify|ssh|steam|svn|tag|teamspeak|tel(?:net)?|tftp|things|thismessage|tip|tn3270|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|view-source|webcal|wss?|wtai|wyciwyg|xcon(?:-userid)?|xfire|xmlrpc\.beeps?|xmpp|xri|ymsgr|z39\.50[rs]?):(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i
+
 CodeMirror.defineMode("gfm", function(config, modeConfig) {
   var codeDepth = 0;
   function blankLine(state) {
@@ -37,7 +39,7 b' CodeMirror.defineMode("gfm", function(co'
 
       // Hack to prevent formatting override inside code blocks (block and inline)
       if (state.codeBlock) {
-        if (stream.match(/^```/)) {
+        if (stream.match(/^```+/)) {
           state.codeBlock = false;
           return null;
         }
@@ -47,7 +49,7 b' CodeMirror.defineMode("gfm", function(co'
       if (stream.sol()) {
         state.code = false;
       }
-      if (stream.sol() && stream.match(/^```/)) {
+      if (stream.sol() && stream.match(/^```+/)) {
         stream.skipToEnd();
         state.codeBlock = true;
         return null;
@@ -78,25 +80,29 b' CodeMirror.defineMode("gfm", function(co'
       }
       if (stream.sol() || state.ateSpace) {
         state.ateSpace = false;
-        if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/)) {
-          // User/Project@SHA
-          // User@SHA
-          // SHA
-          state.combineTokens = true;
-          return "link";
-        } else if (stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/)) {
-          // User/Project#Num
-          // User#Num
-          // #Num
-          state.combineTokens = true;
-          return "link";
+        if (modeConfig.gitHubSpice !== false) {
+          if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/)) {
+            // User/Project@SHA
+            // User@SHA
+            // SHA
+            state.combineTokens = true;
+            return "link";
+          } else if (stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/)) {
+            // User/Project#Num
+            // User#Num
+            // #Num
+            state.combineTokens = true;
+            return "link";
+          }
         }
       }
-      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i) &&
-         stream.string.slice(stream.start - 2, stream.start) != "](") {
+      if (stream.match(urlRE) &&
+          stream.string.slice(stream.start - 2, stream.start) != "](" &&
+          (stream.start == 0 || /\W/.test(stream.string.charAt(stream.start - 1)))) {
         // URLs
         // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
         // And then (issue #1160) simplified to make it not crash the Chrome Regexp engine
+        // And then limited url schemes to the CommonMark list, so foo:bar isn't matched as a URL
         state.combineTokens = true;
         return "link";
       }
@@ -109,15 +115,16 b' CodeMirror.defineMode("gfm", function(co'
   var markdownConfig = {
     underscoresBreakWords: false,
     taskLists: true,
-    fencedCodeBlocks: true,
+    fencedCodeBlocks: '```',
     strikethrough: true
   };
   for (var attr in modeConfig) {
     markdownConfig[attr] = modeConfig[attr];
   }
   markdownConfig.name = "markdown";
-  CodeMirror.defineMIME("gfmBase", markdownConfig);
-  return CodeMirror.overlayMode(CodeMirror.getMode(config, "gfmBase"), gfmOverlay);
+  return CodeMirror.overlayMode(CodeMirror.getMode(config, markdownConfig), gfmOverlay);
+
 }, "markdown");
 
+  CodeMirror.defineMIME("text/x-gfm", "gfm");
 });

rhodecode/public/js/mode/go/go.js

@@ -86,7 +86,7 b' CodeMirror.defineMode("go", function(con'
       var escaped = false, next, end = false;
       while ((next = stream.next()) != null) {
         if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && next == "\\";
+        escaped = !escaped && quote != "`" && next == "\\";
       }
       if (end || !(escaped || quote == "`"))
         state.tokenize = tokenBase;

rhodecode/public/js/mode/haml/haml.js

@@ -85,8 +85,10 b''
           state.tokenize = rubyInQuote(")");
           return state.tokenize(stream, state);
         } else if (ch == "{") {
-          state.tokenize = rubyInQuote("}");
-          return state.tokenize(stream, state);
+          if (!stream.match(/^\{%.*/)) {
+            state.tokenize = rubyInQuote("}");
+            return state.tokenize(stream, state);
+          }
         }
       }
 

rhodecode/public/js/mode/handlebars/handlebars.js

@@ -3,15 +3,15 b''
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"), require("../../addon/mode/multiplex"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
+    define(["../../lib/codemirror", "../../addon/mode/simple", "../../addon/mode/multiplex"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
   "use strict";
 
-  CodeMirror.defineSimpleMode("handlebars", {
+  CodeMirror.defineSimpleMode("handlebars-tags", {
     start: [
       { regex: /\{\{!--/, push: "dash_comment", token: "comment" },
       { regex: /\{\{!/,   push: "comment", token: "comment" },
@@ -21,8 +21,8 b''
       { regex: /\}\}/, pop: true, token: "tag" },
 
       // Double and single quotes
-      { regex: /"(?:[^\\]|\\.)*?"/, token: "string" },
-      { regex: /'(?:[^\\]|\\.)*?'/, token: "string" },
+      { regex: /"(?:[^\\"]|\\.)*"?/, token: "string" },
+      { regex: /'(?:[^\\']|\\.)*'?/, token: "string" },
 
       // Handlebars keywords
       { regex: />|[#\/]([A-Za-z_]\w*)/, token: "keyword" },
@@ -49,5 +49,14 b''
     ]
   });
 
+  CodeMirror.defineMode("handlebars", function(config, parserConfig) {
+    var handlebars = CodeMirror.getMode(config, "handlebars-tags");
+    if (!parserConfig || !parserConfig.base) return handlebars;
+    return CodeMirror.multiplexingMode(
+      CodeMirror.getMode(config, parserConfig.base),
+      {open: "{{", close: "}}", mode: handlebars, parseDelimiters: true}
+    );
+  });
+
   CodeMirror.defineMIME("text/x-handlebars-template", "handlebars");
 });

rhodecode/public/js/mode/haxe/haxe.js

@@ -16,23 +16,21 b' CodeMirror.defineMode("haxe", function(c'
 
   // Tokenizer
 
-  var keywords = function(){
-    function kw(type) {return {type: type, style: "keyword"};}
-    var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
-    var operator = kw("operator"), atom = {type: "atom", style: "atom"}, attribute = {type:"attribute", style: "attribute"};
+  function kw(type) {return {type: type, style: "keyword"};}
+  var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
+  var operator = kw("operator"), atom = {type: "atom", style: "atom"}, attribute = {type:"attribute", style: "attribute"};
   var type = kw("typedef");
-    return {
-      "if": A, "while": A, "else": B, "do": B, "try": B,
-      "return": C, "break": C, "continue": C, "new": C, "throw": C,
-      "var": kw("var"), "inline":attribute, "static": attribute, "using":kw("import"),
+  var keywords = {
+    "if": A, "while": A, "else": B, "do": B, "try": B,
+    "return": C, "break": C, "continue": C, "new": C, "throw": C,
+    "var": kw("var"), "inline":attribute, "static": attribute, "using":kw("import"),
     "public": attribute, "private": attribute, "cast": kw("cast"), "import": kw("import"), "macro": kw("macro"),
-      "function": kw("function"), "catch": kw("catch"), "untyped": kw("untyped"), "callback": kw("cb"),
-      "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
-      "in": operator, "never": kw("property_access"), "trace":kw("trace"),
+    "function": kw("function"), "catch": kw("catch"), "untyped": kw("untyped"), "callback": kw("cb"),
+    "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
+    "in": operator, "never": kw("property_access"), "trace":kw("trace"),
     "class": type, "abstract":type, "enum":type, "interface":type, "typedef":type, "extends":type, "implements":type, "dynamic":type,
-      "true": atom, "false": atom, "null": atom
-    };
-  }();
+    "true": atom, "false": atom, "null": atom
+  };
 
   var isOperatorChar = /[+\-*&%=<>!?|]/;
 
@@ -41,14 +39,13 b' CodeMirror.defineMode("haxe", function(c'
     return f(stream, state);
   }
 
-  function nextUntilUnescaped(stream, end) {
+  function toUnescaped(stream, end) {
     var escaped = false, next;
     while ((next = stream.next()) != null) {
       if (next == end && !escaped)
-        return false;
+        return true;
       escaped = !escaped && next == "\\";
     }
-    return escaped;
   }
 
   // Used as scratch variables to communicate multiple values without
@@ -61,70 +58,58 b' CodeMirror.defineMode("haxe", function(c'
 
   function haxeTokenBase(stream, state) {
     var ch = stream.next();
-    if (ch == '"' || ch == "'")
+    if (ch == '"' || ch == "'") {
       return chain(stream, state, haxeTokenString(ch));
-    else if (/[\[\]{}\(\),;\:\.]/.test(ch))
+    } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
       return ret(ch);
-    else if (ch == "0" && stream.eat(/x/i)) {
+    } else if (ch == "0" && stream.eat(/x/i)) {
       stream.eatWhile(/[\da-f]/i);
       return ret("number", "number");
-    }
-    else if (/\d/.test(ch) || ch == "-" && stream.eat(/\d/)) {
-      stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
+    } else if (/\d/.test(ch) || ch == "-" && stream.eat(/\d/)) {
+      stream.match(/^\d*(?:\.\d*(?!\.))?(?:[eE][+\-]?\d+)?/);
       return ret("number", "number");
-    }
-    else if (state.reAllowed && (ch == "~" && stream.eat(/\//))) {
-      nextUntilUnescaped(stream, "/");
+    } else if (state.reAllowed && (ch == "~" && stream.eat(/\//))) {
+      toUnescaped(stream, "/");
       stream.eatWhile(/[gimsu]/);
       return ret("regexp", "string-2");
-    }
-    else if (ch == "/") {
+    } else if (ch == "/") {
       if (stream.eat("*")) {
         return chain(stream, state, haxeTokenComment);
-      }
-      else if (stream.eat("/")) {
+      } else if (stream.eat("/")) {
         stream.skipToEnd();
         return ret("comment", "comment");
-      }
-      else {
+      } else {
         stream.eatWhile(isOperatorChar);
         return ret("operator", null, stream.current());
       }
-    }
-    else if (ch == "#") {
+    } else if (ch == "#") {
         stream.skipToEnd();
         return ret("conditional", "meta");
-    }
-    else if (ch == "@") {
+    } else if (ch == "@") {
       stream.eat(/:/);
       stream.eatWhile(/[\w_]/);
       return ret ("metadata", "meta");
-    }
-    else if (isOperatorChar.test(ch)) {
+    } else if (isOperatorChar.test(ch)) {
       stream.eatWhile(isOperatorChar);
       return ret("operator", null, stream.current());
-    }
-    else {
-    var word;
-    if(/[A-Z]/.test(ch))
-    {
-      stream.eatWhile(/[\w_<>]/);
-      word = stream.current();
-      return ret("type", "variable-3", word);
-    }
-    else
-    {
+    } else {
+      var word;
+      if(/[A-Z]/.test(ch)) {
+        stream.eatWhile(/[\w_<>]/);
+        word = stream.current();
+        return ret("type", "variable-3", word);
+      } else {
         stream.eatWhile(/[\w_]/);
         var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
         return (known && state.kwAllowed) ? ret(known.type, known.style, word) :
                        ret("variable", "variable", word);
-    }
+      }
     }
   }
 
   function haxeTokenString(quote) {
     return function(stream, state) {
-      if (!nextUntilUnescaped(stream, quote))
+      if (toUnescaped(stream, quote))
         state.tokenize = haxeTokenBase;
       return ret("string", "string");
     };
@@ -176,27 +161,25 b' CodeMirror.defineMode("haxe", function(c'
           cc.pop()();
         if (cx.marked) return cx.marked;
         if (type == "variable" && inScope(state, content)) return "variable-2";
-    if (type == "variable" && imported(state, content)) return "variable-3";
+        if (type == "variable" && imported(state, content)) return "variable-3";
         return style;
       }
     }
   }
 
-  function imported(state, typename)
-  {
-  if (/[a-z]/.test(typename.charAt(0)))
-    return false;
-  var len = state.importedtypes.length;
-  for (var i = 0; i<len; i++)
-    if(state.importedtypes[i]==typename) return true;
+  function imported(state, typename) {
+    if (/[a-z]/.test(typename.charAt(0)))
+      return false;
+    var len = state.importedtypes.length;
+    for (var i = 0; i<len; i++)
+      if(state.importedtypes[i]==typename) return true;
   }
 
-
   function registerimport(importname) {
-  var state = cx.state;
-  for (var t = state.importedtypes; t; t = t.next)
-    if(t.name == importname) return;
-  state.importedtypes = { name: importname, next: state.importedtypes };
+    var state = cx.state;
+    for (var t = state.importedtypes; t; t = t.next)
+      if(t.name == importname) return;
+    state.importedtypes = { name: importname, next: state.importedtypes };
   }
   // Combinator utils
 
@@ -208,13 +191,20 b' CodeMirror.defineMode("haxe", function(c'
     pass.apply(null, arguments);
     return true;
   }
+  function inList(name, list) {
+    for (var v = list; v; v = v.next)
+      if (v.name == name) return true;
+    return false;
+  }
   function register(varname) {
     var state = cx.state;
     if (state.context) {
       cx.marked = "def";
-      for (var v = state.localVars; v; v = v.next)
-        if (v.name == varname) return;
+      if (inList(varname, state.localVars)) return;
       state.localVars = {name: varname, next: state.localVars};
+    } else if (state.globalVars) {
+      if (inList(varname, state.globalVars)) return;
+      state.globalVars = {name: varname, next: state.globalVars};
     }
   }
 
@@ -229,6 +219,7 b' CodeMirror.defineMode("haxe", function(c'
     cx.state.localVars = cx.state.context.vars;
     cx.state.context = cx.state.context.prev;
   }
+  popcontext.lex = true;
   function pushlex(type, info) {
     var result = function() {
       var state = cx.state;
@@ -252,7 +243,7 b' CodeMirror.defineMode("haxe", function(c'
       if (type == wanted) return cont();
       else if (wanted == ";") return pass();
       else return cont(f);
-    };
+    }
     return f;
   }
 
@@ -266,25 +257,26 b' CodeMirror.defineMode("haxe", function(c'
     if (type == "attribute") return cont(maybeattribute);
     if (type == "function") return cont(functiondef);
     if (type == "for") return cont(pushlex("form"), expect("("), pushlex(")"), forspec1, expect(")"),
-                                      poplex, statement, poplex);
+                                   poplex, statement, poplex);
     if (type == "variable") return cont(pushlex("stat"), maybelabel);
     if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
-                                         block, poplex, poplex);
+                                      block, poplex, poplex);
     if (type == "case") return cont(expression, expect(":"));
     if (type == "default") return cont(expect(":"));
     if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
-                                        statement, poplex, popcontext);
+                                     statement, poplex, popcontext);
     if (type == "import") return cont(importdef, expect(";"));
     if (type == "typedef") return cont(typedef);
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }
   function expression(type) {
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeoperator);
+    if (type == "type" ) return cont(maybeoperator);
     if (type == "function") return cont(functiondef);
     if (type == "keyword c") return cont(maybeexpression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeoperator);
     if (type == "operator") return cont(expression);
-    if (type == "[") return cont(pushlex("]"), commasep(expression, "]"), poplex, maybeoperator);
+    if (type == "[") return cont(pushlex("]"), commasep(maybeexpression, "]"), poplex, maybeoperator);
     if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeoperator);
     return cont();
   }
@@ -318,14 +310,14 b' CodeMirror.defineMode("haxe", function(c'
   }
 
   function importdef (type, value) {
-  if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
-  else if(type == "variable" || type == "property" || type == "." || value == "*") return cont(importdef);
+    if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
+    else if(type == "variable" || type == "property" || type == "." || value == "*") return cont(importdef);
   }
 
   function typedef (type, value)
   {
-  if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
-  else if (type == "type" && /[A-Z]/.test(value.charAt(0))) { return cont(); }
+    if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
+    else if (type == "type" && /[A-Z]/.test(value.charAt(0))) { return cont(); }
   }
 
   function maybelabel(type) {
@@ -363,16 +355,19 b' CodeMirror.defineMode("haxe", function(c'
     if (type == ",") return cont(vardef1);
   }
   function forspec1(type, value) {
-  if (type == "variable") {
-    register(value);
-  }
-  return cont(pushlex(")"), pushcontext, forin, expression, poplex, statement, popcontext);
+    if (type == "variable") {
+      register(value);
+      return cont(forin, expression)
+    } else {
+      return pass()
+    }
   }
   function forin(_type, value) {
     if (value == "in") return cont();
   }
   function functiondef(type, value) {
-    if (type == "variable") {register(value); return cont(functiondef);}
+    //function names starting with upper-case letters are recognised as types, so cludging them together here.
+    if (type == "variable" || type == "type") {register(value); return cont(functiondef);}
     if (value == "new") return cont(functiondef);
     if (type == "(") return cont(pushlex(")"), pushcontext, commasep(funarg, ")"), poplex, typeuse, statement, popcontext);
   }
@@ -392,21 +387,23 b' CodeMirror.defineMode("haxe", function(c'
   }
 
   // Interface
-
   return {
     startState: function(basecolumn) {
-    var defaulttypes = ["Int", "Float", "String", "Void", "Std", "Bool", "Dynamic", "Array"];
-      return {
+      var defaulttypes = ["Int", "Float", "String", "Void", "Std", "Bool", "Dynamic", "Array"];
+      var state = {
         tokenize: haxeTokenBase,
         reAllowed: true,
         kwAllowed: true,
         cc: [],
         lexical: new HaxeLexical((basecolumn || 0) - indentUnit, 0, "block", false),
         localVars: parserConfig.localVars,
-    importedtypes: defaulttypes,
+        importedtypes: defaulttypes,
         context: parserConfig.localVars && {vars: parserConfig.localVars},
         indented: 0
       };
+      if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
+        state.globalVars = parserConfig.globalVars;
+      return state;
     },
 
     token: function(stream, state) {

rhodecode/public/js/mode/htmlmixed/htmlmixed.js

@@ -9,113 +9,142 b''
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
-  var htmlMode = CodeMirror.getMode(config, {name: "xml",
-                                             htmlMode: true,
-                                             multilineTagIndentFactor: parserConfig.multilineTagIndentFactor,
-                                             multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag});
-  var cssMode = CodeMirror.getMode(config, "css");
-
-  var scriptTypes = [], scriptTypesConf = parserConfig && parserConfig.scriptTypes;
-  scriptTypes.push({matches: /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i,
-                    mode: CodeMirror.getMode(config, "javascript")});
-  if (scriptTypesConf) for (var i = 0; i < scriptTypesConf.length; ++i) {
-    var conf = scriptTypesConf[i];
-    scriptTypes.push({matches: conf.matches, mode: conf.mode && CodeMirror.getMode(config, conf.mode)});
-  }
-  scriptTypes.push({matches: /./,
-                    mode: CodeMirror.getMode(config, "text/plain")});
+  "use strict";
 
-  function html(stream, state) {
-    var tagName = state.htmlState.tagName;
-    if (tagName) tagName = tagName.toLowerCase();
-    var style = htmlMode.token(stream, state.htmlState);
-    if (tagName == "script" && /\btag\b/.test(style) && stream.current() == ">") {
-      // Script block: mode to change to depends on type attribute
-      var scriptType = stream.string.slice(Math.max(0, stream.pos - 100), stream.pos).match(/\btype\s*=\s*("[^"]+"|'[^']+'|\S+)[^<]*$/i);
-      scriptType = scriptType ? scriptType[1] : "";
-      if (scriptType && /[\"\']/.test(scriptType.charAt(0))) scriptType = scriptType.slice(1, scriptType.length - 1);
-      for (var i = 0; i < scriptTypes.length; ++i) {
-        var tp = scriptTypes[i];
-        if (typeof tp.matches == "string" ? scriptType == tp.matches : tp.matches.test(scriptType)) {
-          if (tp.mode) {
-            state.token = script;
-            state.localMode = tp.mode;
-            state.localState = tp.mode.startState && tp.mode.startState(htmlMode.indent(state.htmlState, ""));
-          }
-          break;
-        }
-      }
-    } else if (tagName == "style" && /\btag\b/.test(style) && stream.current() == ">") {
-      state.token = css;
-      state.localMode = cssMode;
-      state.localState = cssMode.startState(htmlMode.indent(state.htmlState, ""));
-    }
-    return style;
-  }
+  var defaultTags = {
+    script: [
+      ["lang", /(javascript|babel)/i, "javascript"],
+      ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i, "javascript"],
+      ["type", /./, "text/plain"],
+      [null, null, "javascript"]
+    ],
+    style:  [
+      ["lang", /^css$/i, "css"],
+      ["type", /^(text\/)?(x-)?(stylesheet|css)$/i, "css"],
+      ["type", /./, "text/plain"],
+      [null, null, "css"]
+    ]
+  };
+
   function maybeBackup(stream, pat, style) {
-    var cur = stream.current();
-    var close = cur.search(pat);
-    if (close > -1) stream.backUp(cur.length - close);
-    else if (cur.match(/<\/?$/)) {
+    var cur = stream.current(), close = cur.search(pat);
+    if (close > -1) {
+      stream.backUp(cur.length - close);
+    } else if (cur.match(/<\/?$/)) {
       stream.backUp(cur.length);
       if (!stream.match(pat, false)) stream.match(cur);
     }
     return style;
   }
-  function script(stream, state) {
-    if (stream.match(/^<\/\s*script\s*>/i, false)) {
-      state.token = html;
-      state.localState = state.localMode = null;
-      return null;
-    }
-    return maybeBackup(stream, /<\/\s*script\s*>/,
-                       state.localMode.token(stream, state.localState));
+
+  var attrRegexpCache = {};
+  function getAttrRegexp(attr) {
+    var regexp = attrRegexpCache[attr];
+    if (regexp) return regexp;
+    return attrRegexpCache[attr] = new RegExp("\\s+" + attr + "\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*");
+  }
+
+  function getAttrValue(stream, attr) {
+    var pos = stream.pos, match;
+    while (pos >= 0 && stream.string.charAt(pos) !== "<") pos--;
+    if (pos < 0) return pos;
+    if (match = stream.string.slice(pos, stream.pos).match(getAttrRegexp(attr)))
+      return match[2];
+    return "";
   }
-  function css(stream, state) {
-    if (stream.match(/^<\/\s*style\s*>/i, false)) {
-      state.token = html;
-      state.localState = state.localMode = null;
-      return null;
+
+  function getTagRegexp(tagName, anchored) {
+    return new RegExp((anchored ? "^" : "") + "<\/\s*" + tagName + "\s*>", "i");
+  }
+
+  function addTags(from, to) {
+    for (var tag in from) {
+      var dest = to[tag] || (to[tag] = []);
+      var source = from[tag];
+      for (var i = source.length - 1; i >= 0; i--)
+        dest.unshift(source[i])
     }
-    return maybeBackup(stream, /<\/\s*style\s*>/,
-                       cssMode.token(stream, state.localState));
+  }
+
+  function findMatchingMode(tagInfo, stream) {
+    for (var i = 0; i < tagInfo.length; i++) {
+      var spec = tagInfo[i];
+      if (!spec[0] || spec[1].test(getAttrValue(stream, spec[0]))) return spec[2];
+    }
   }
 
-  return {
-    startState: function() {
-      var state = htmlMode.startState();
-      return {token: html, localMode: null, localState: null, htmlState: state};
-    },
+  CodeMirror.defineMode("htmlmixed", function (config, parserConfig) {
+    var htmlMode = CodeMirror.getMode(config, {
+      name: "xml",
+      htmlMode: true,
+      multilineTagIndentFactor: parserConfig.multilineTagIndentFactor,
+      multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag
+    });
 
-    copyState: function(state) {
-      if (state.localState)
-        var local = CodeMirror.copyState(state.localMode, state.localState);
-      return {token: state.token, localMode: state.localMode, localState: local,
-              htmlState: CodeMirror.copyState(htmlMode, state.htmlState)};
-    },
+    var tags = {};
+    var configTags = parserConfig && parserConfig.tags, configScript = parserConfig && parserConfig.scriptTypes;
+    addTags(defaultTags, tags);
+    if (configTags) addTags(configTags, tags);
+    if (configScript) for (var i = configScript.length - 1; i >= 0; i--)
+      tags.script.unshift(["type", configScript[i].matches, configScript[i].mode])
 
-    token: function(stream, state) {
-      return state.token(stream, state);
-    },
+    function html(stream, state) {
+      var tagName = state.htmlState.tagName && state.htmlState.tagName.toLowerCase();
+      var tagInfo = tagName && tags.hasOwnProperty(tagName) && tags[tagName];
+
+      var style = htmlMode.token(stream, state.htmlState), modeSpec;
 
-    indent: function(state, textAfter) {
-      if (!state.localMode || /^\s*<\//.test(textAfter))
-        return htmlMode.indent(state.htmlState, textAfter);
-      else if (state.localMode.indent)
-        return state.localMode.indent(state.localState, textAfter);
-      else
-        return CodeMirror.Pass;
-    },
+      if (tagInfo && /\btag\b/.test(style) && stream.current() === ">" &&
+          (modeSpec = findMatchingMode(tagInfo, stream))) {
+        var mode = CodeMirror.getMode(config, modeSpec);
+        var endTagA = getTagRegexp(tagName, true), endTag = getTagRegexp(tagName, false);
+        state.token = function (stream, state) {
+          if (stream.match(endTagA, false)) {
+            state.token = html;
+            state.localState = state.localMode = null;
+            return null;
+          }
+          return maybeBackup(stream, endTag, state.localMode.token(stream, state.localState));
+        };
+        state.localMode = mode;
+        state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, ""));
+      }
+      return style;
+    };
+
+    return {
+      startState: function () {
+        var state = htmlMode.startState();
+        return {token: html, localMode: null, localState: null, htmlState: state};
+      },
 
-    innerMode: function(state) {
-      return {state: state.localState || state.htmlState, mode: state.localMode || htmlMode};
-    }
-  };
-}, "xml", "javascript", "css");
+      copyState: function (state) {
+        var local;
+        if (state.localState) {
+          local = CodeMirror.copyState(state.localMode, state.localState);
+        }
+        return {token: state.token, localMode: state.localMode, localState: local,
+                htmlState: CodeMirror.copyState(htmlMode, state.htmlState)};
+      },
+
+      token: function (stream, state) {
+        return state.token(stream, state);
+      },
 
-CodeMirror.defineMIME("text/html", "htmlmixed");
+      indent: function (state, textAfter) {
+        if (!state.localMode || /^\s*<\//.test(textAfter))
+          return htmlMode.indent(state.htmlState, textAfter);
+        else if (state.localMode.indent)
+          return state.localMode.indent(state.localState, textAfter);
+        else
+          return CodeMirror.Pass;
+      },
 
+      innerMode: function (state) {
+        return {state: state.localState || state.htmlState, mode: state.localMode || htmlMode};
+      }
+    };
+  }, "xml", "javascript", "css");
+
+  CodeMirror.defineMIME("text/html", "htmlmixed");
 });

rhodecode/public/js/mode/jade/jade.js

@@ -74,7 +74,7 b" CodeMirror.defineMode('jade', function ("
     res.javaScriptArguments = this.javaScriptArguments;
     res.javaScriptArgumentsDepth = this.javaScriptArgumentsDepth;
     res.isInterpolating = this.isInterpolating;
-    res.interpolationNesting = this.intpolationNesting;
+    res.interpolationNesting = this.interpolationNesting;
 
     res.jsState = CodeMirror.copyState(jsMode, this.jsState);
 
@@ -167,7 +167,7 b" CodeMirror.defineMode('jade', function ("
         if (state.interpolationNesting < 0) {
           stream.next();
           state.isInterpolating = false;
-          return 'puncutation';
+          return 'punctuation';
         }
       } else if (stream.peek() === '{') {
         state.interpolationNesting++;
@@ -583,7 +583,7 b" CodeMirror.defineMode('jade', function ("
     copyState: copyState,
     token: nextToken
   };
-});
+}, 'javascript', 'css', 'htmlmixed');
 
 CodeMirror.defineMIME('text/x-jade', 'jade');
 

rhodecode/public/js/mode/javascript/javascript.js

@@ -13,6 +13,11 b''
 })(function(CodeMirror) {
 "use strict";
 
+function expressionAllowed(stream, state, backUp) {
+  return /^(?:operator|sof|keyword c|case|new|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
+    (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
+}
+
 CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var statementIndent = parserConfig.statementIndent;
@@ -30,13 +35,13 b' CodeMirror.defineMode("javascript", func'
 
     var jsKeywords = {
       "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
-      "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C, "debugger": C,
+      "return": C, "break": C, "continue": C, "new": kw("new"), "delete": C, "throw": C, "debugger": C,
       "var": kw("var"), "const": kw("var"), "let": kw("var"),
       "function": kw("function"), "catch": kw("catch"),
       "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
       "in": operator, "typeof": operator, "instanceof": operator,
       "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
-      "this": kw("this"), "module": kw("module"), "class": kw("class"), "super": kw("atom"),
+      "this": kw("this"), "class": kw("class"), "super": kw("atom"),
       "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
     };
 
@@ -45,18 +50,23 b' CodeMirror.defineMode("javascript", func'
       var type = {type: "variable", style: "variable-3"};
       var tsKeywords = {
         // object-like things
-        "interface": kw("interface"),
-        "extends": kw("extends"),
-        "constructor": kw("constructor"),
+        "interface": kw("class"),
+        "implements": C,
+        "namespace": C,
+        "module": kw("module"),
+        "enum": kw("module"),
 
         // scope modifiers
-        "public": kw("public"),
-        "private": kw("private"),
-        "protected": kw("protected"),
-        "static": kw("static"),
+        "public": kw("modifier"),
+        "private": kw("modifier"),
+        "protected": kw("modifier"),
+        "abstract": kw("modifier"),
+
+        // operators
+        "as": operator,
 
         // types
-        "string": type, "number": type, "bool": type, "any": type
+        "string": type, "number": type, "boolean": type, "any": type
       };
 
       for (var attr in tsKeywords) {
@@ -105,6 +115,12 b' CodeMirror.defineMode("javascript", func'
     } else if (ch == "0" && stream.eat(/x/i)) {
       stream.eatWhile(/[\da-f]/i);
       return ret("number", "number");
+    } else if (ch == "0" && stream.eat(/o/i)) {
+      stream.eatWhile(/[0-7]/i);
+      return ret("number", "number");
+    } else if (ch == "0" && stream.eat(/b/i)) {
+      stream.eatWhile(/[01]/i);
+      return ret("number", "number");
     } else if (/\d/.test(ch)) {
       stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
       return ret("number", "number");
@@ -115,8 +131,7 b' CodeMirror.defineMode("javascript", func'
       } else if (stream.eat("/")) {
         stream.skipToEnd();
         return ret("comment", "comment");
-      } else if (state.lastType == "operator" || state.lastType == "keyword c" ||
-               state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
+      } else if (expressionAllowed(stream, state, 1)) {
         readRegexp(stream);
         stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
         return ret("regexp", "string-2");
@@ -275,8 +290,8 b' CodeMirror.defineMode("javascript", func'
       return false;
     }
     var state = cx.state;
+    cx.marked = "def";
     if (state.context) {
-      cx.marked = "def";
       if (inList(state.localVars)) return;
       state.localVars = {name: varname, next: state.localVars};
     } else {
@@ -347,10 +362,10 b' CodeMirror.defineMode("javascript", func'
     if (type == "default") return cont(expect(":"));
     if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
                                      statement, poplex, popcontext);
-    if (type == "module") return cont(pushlex("form"), pushcontext, afterModule, popcontext, poplex);
     if (type == "class") return cont(pushlex("form"), className, poplex);
-    if (type == "export") return cont(pushlex("form"), afterExport, poplex);
-    if (type == "import") return cont(pushlex("form"), afterImport, poplex);
+    if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
+    if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
+    if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex)
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }
   function expression(type) {
@@ -374,7 +389,8 b' CodeMirror.defineMode("javascript", func'
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
     if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
     if (type == "{") return contCommasep(objprop, "}", null, maybeop);
-    if (type == "quasi") { return pass(quasi, maybeop); }
+    if (type == "quasi") return pass(quasi, maybeop);
+    if (type == "new") return cont(maybeTarget(noComma));
     return cont();
   }
   function maybeexpression(type) {
@@ -425,6 +441,18 b' CodeMirror.defineMode("javascript", func'
     findFatArrow(cx.stream, cx.state);
     return pass(type == "{" ? statement : expressionNoComma);
   }
+  function maybeTarget(noComma) {
+    return function(type) {
+      if (type == ".") return cont(noComma ? targetNoComma : target);
+      else return pass(noComma ? expressionNoComma : expression);
+    };
+  }
+  function target(_, value) {
+    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorComma); }
+  }
+  function targetNoComma(_, value) {
+    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorNoComma); }
+  }
   function maybelabel(type) {
     if (type == ":") return cont(poplex, statement);
     return pass(maybeoperatorComma, expect(";"), poplex);
@@ -442,8 +470,12 b' CodeMirror.defineMode("javascript", func'
       return cont(afterprop);
     } else if (type == "jsonld-keyword") {
       return cont(afterprop);
+    } else if (type == "modifier") {
+      return cont(objprop)
     } else if (type == "[") {
       return cont(expression, expect("]"), afterprop);
+    } else if (type == "spread") {
+      return cont(expression);
     }
   }
   function getterSetter(type) {
@@ -492,7 +524,9 b' CodeMirror.defineMode("javascript", func'
     return pass(pattern, maybetype, maybeAssign, vardefCont);
   }
   function pattern(type, value) {
+    if (type == "modifier") return cont(pattern)
     if (type == "variable") { register(value); return cont(); }
+    if (type == "spread") return cont(pattern);
     if (type == "[") return contCommasep(pattern, "]");
     if (type == "{") return contCommasep(proppattern, "}");
   }
@@ -502,6 +536,8 b' CodeMirror.defineMode("javascript", func'
       return cont(maybeAssign);
     }
     if (type == "variable") cx.marked = "property";
+    if (type == "spread") return cont(pattern);
+    if (type == "}") return pass();
     return cont(expect(":"), pattern, maybeAssign);
   }
   function maybeAssign(_type, value) {
@@ -572,10 +608,6 b' CodeMirror.defineMode("javascript", func'
     cx.marked = "property";
     return cont();
   }
-  function afterModule(type, value) {
-    if (type == "string") return cont(statement);
-    if (type == "variable") { register(value); return cont(maybeFrom); }
-  }
   function afterExport(_type, value) {
     if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
     if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); }
@@ -628,7 +660,7 b' CodeMirror.defineMode("javascript", func'
         lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
         localVars: parserConfig.localVars,
         context: parserConfig.localVars && {vars: parserConfig.localVars},
-        indented: 0
+        indented: basecolumn || 0
       };
       if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
         state.globalVars = parserConfig.globalVars;
@@ -684,7 +716,13 b' CodeMirror.defineMode("javascript", func'
 
     helperType: jsonMode ? "json" : "javascript",
     jsonldMode: jsonldMode,
-    jsonMode: jsonMode
+    jsonMode: jsonMode,
+
+    expressionAllowed: expressionAllowed,
+    skipExpression: function(state) {
+      var top = state.cc[state.cc.length - 1]
+      if (top == expression || top == expressionNoComma) state.cc.pop()
+    }
   };
 });
 

rhodecode/public/js/mode/julia/julia.js

@@ -18,35 +18,34 b' CodeMirror.defineMode("julia", function('
     return new RegExp("^((" + words.join(")|(") + "))\\b");
   }
 
-  var operators = parserConf.operators || /^\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b/;
+  var operators = parserConf.operators || /^\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b(?!\()|[\u2208\u2209](?!\()/;
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
-  var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/;
+  var identifiers = parserConf.identifiers || /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/;
   var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch", "do"];
   var blockClosers = ["end", "else", "elseif", "catch", "finally"];
-  var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype', 'ccall'];
-  var builtinList = ['true', 'false', 'enumerate', 'open', 'close', 'nothing', 'NaN', 'Inf', 'print', 'println', 'Int', 'Int8', 'Uint8', 'Int16', 'Uint16', 'Int32', 'Uint32', 'Int64', 'Uint64', 'Int128', 'Uint128', 'Bool', 'Char', 'Float16', 'Float32', 'Float64', 'Array', 'Vector', 'Matrix', 'String', 'UTF8String', 'ASCIIString', 'error', 'warn', 'info', '@printf'];
+  var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype'];
+  var builtinList = ['true', 'false', 'nothing', 'NaN', 'Inf'];
 
   //var stringPrefixes = new RegExp("^[br]?('|\")")
-  var stringPrefixes = /^(`|'|"{3}|([br]?"))/;
+  var stringPrefixes = /^(`|'|"{3}|([brv]?"))/;
   var keywords = wordRegexp(keywordList);
   var builtins = wordRegexp(builtinList);
   var openers = wordRegexp(blockOpeners);
   var closers = wordRegexp(blockClosers);
   var macro = /^@[_A-Za-z][_A-Za-z0-9]*/;
-  var symbol = /^:[_A-Za-z][_A-Za-z0-9]*/;
+  var symbol = /^:[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/;
+  var typeAnnotation = /^::[^.,;"{()=$\s]+({[^}]*}+)*/;
 
-  function in_array(state) {
-    var ch = cur_scope(state);
-    if(ch=="[" || ch=="{") {
+  function inArray(state) {
+    var ch = currentScope(state);
+    if (ch == '[') {
       return true;
     }
-    else {
-      return false;
-    }
+    return false;
   }
 
-  function cur_scope(state) {
-    if(state.scopes.length==0) {
+  function currentScope(state) {
+    if (state.scopes.length == 0) {
       return null;
     }
     return state.scopes[state.scopes.length - 1];
@@ -54,20 +53,34 b' CodeMirror.defineMode("julia", function('
 
   // tokenizers
   function tokenBase(stream, state) {
+    //Handle multiline comments
+    if (stream.match(/^#=\s*/)) {
+      state.scopes.push('#=');
+    }
+    if (currentScope(state) == '#=' && stream.match(/^=#/)) {
+      state.scopes.pop();
+      return 'comment';
+    }
+    if (state.scopes.indexOf('#=') >= 0) {
+      if (!stream.match(/.*?(?=(#=|=#))/)) {
+        stream.skipToEnd();
+      }
+      return 'comment';
+    }
+
     // Handle scope changes
-    var leaving_expr = state.leaving_expr;
-    if(stream.sol()) {
-      leaving_expr = false;
+    var leavingExpr = state.leavingExpr;
+    if (stream.sol()) {
+      leavingExpr = false;
     }
-    state.leaving_expr = false;
-    if(leaving_expr) {
-      if(stream.match(/^'+/)) {
+    state.leavingExpr = false;
+    if (leavingExpr) {
+      if (stream.match(/^'+/)) {
         return 'operator';
       }
-
     }
 
-    if(stream.match(/^\.{2,3}/)) {
+    if (stream.match(/^\.{2,3}/)) {
       return 'operator';
     }
 
@@ -76,56 +89,51 b' CodeMirror.defineMode("julia", function('
     }
 
     var ch = stream.peek();
-    // Handle Comments
+
+    // Handle single line comments
     if (ch === '#') {
-        stream.skipToEnd();
-        return 'comment';
-    }
-    if(ch==='[') {
-      state.scopes.push("[");
+      stream.skipToEnd();
+      return 'comment';
     }
 
-    if(ch==='{') {
-      state.scopes.push("{");
+    if (ch === '[') {
+      state.scopes.push('[');
     }
 
-    var scope=cur_scope(state);
+    var scope = currentScope(state);
 
-    if(scope==='[' && ch===']') {
+    if (scope == '[' && ch === ']') {
       state.scopes.pop();
-      state.leaving_expr=true;
+      state.leavingExpr = true;
     }
 
-    if(scope==='{' && ch==='}') {
+    if (scope == '(' && ch === ')') {
       state.scopes.pop();
-      state.leaving_expr=true;
-    }
-
-    if(ch===')') {
-      state.leaving_expr = true;
+      state.leavingExpr = true;
     }
 
     var match;
-    if(!in_array(state) && (match=stream.match(openers, false))) {
+    if (!inArray(state) && (match=stream.match(openers, false))) {
       state.scopes.push(match);
     }
 
-    if(!in_array(state) && stream.match(closers, false)) {
+    if (!inArray(state) && stream.match(closers, false)) {
       state.scopes.pop();
     }
 
-    if(in_array(state)) {
-      if(stream.match(/^end/)) {
+    if (inArray(state)) {
+      if (state.lastToken == 'end' && stream.match(/^:/)) {
+        return 'operator';
+      }
+      if (stream.match(/^end/)) {
         return 'number';
       }
-
     }
 
-    if(stream.match(/^=>/)) {
+    if (stream.match(/^=>/)) {
       return 'operator';
     }
 
-
     // Handle Number Literals
     if (stream.match(/^[0-9\.]/, false)) {
       var imMatcher = RegExp(/^im\b/);
@@ -134,10 +142,11 b' CodeMirror.defineMode("julia", function('
       if (stream.match(/^\d*\.(?!\.)\d+([ef][\+\-]?\d+)?/i)) { floatLiteral = true; }
       if (stream.match(/^\d+\.(?!\.)\d*/)) { floatLiteral = true; }
       if (stream.match(/^\.\d+/)) { floatLiteral = true; }
+      if (stream.match(/^0x\.[0-9a-f]+p[\+\-]?\d+/i)) { floatLiteral = true; }
       if (floatLiteral) {
           // Float literals may be "imaginary"
           stream.match(imMatcher);
-          state.leaving_expr = true;
+          state.leavingExpr = true;
           return 'number';
       }
       // Integers
@@ -157,18 +166,27 b' CodeMirror.defineMode("julia", function('
       if (intLiteral) {
           // Integer literals may be "long"
           stream.match(imMatcher);
-          state.leaving_expr = true;
+          state.leavingExpr = true;
           return 'number';
       }
     }
 
-    if(stream.match(/^(::)|(<:)/)) {
+    if (stream.match(/^<:/)) {
       return 'operator';
     }
 
+    if (stream.match(typeAnnotation)) {
+      return 'builtin';
+    }
+
     // Handle symbols
-    if(!leaving_expr && stream.match(symbol)) {
-      return 'string';
+    if (!leavingExpr && stream.match(symbol) || stream.match(/:\./)) {
+      return 'builtin';
+    }
+
+    // Handle parametric types
+    if (stream.match(/^{[^}]*}(?=\()/)) {
+      return 'builtin';
     }
 
     // Handle operators and Delimiters
@@ -176,7 +194,6 b' CodeMirror.defineMode("julia", function('
       return 'operator';
     }
 
-
     // Handle Strings
     if (stream.match(stringPrefixes)) {
       state.tokenize = tokenStringFactory(stream.current());
@@ -187,7 +204,6 b' CodeMirror.defineMode("julia", function('
       return 'meta';
     }
 
-
     if (stream.match(delimiters)) {
       return null;
     }
@@ -200,21 +216,74 b' CodeMirror.defineMode("julia", function('
       return 'builtin';
     }
 
+    var isDefinition = state.isDefinition ||
+                       state.lastToken == 'function' ||
+                       state.lastToken == 'macro' ||
+                       state.lastToken == 'type' ||
+                       state.lastToken == 'immutable';
 
     if (stream.match(identifiers)) {
-      state.leaving_expr=true;
+      if (isDefinition) {
+        if (stream.peek() === '.') {
+          state.isDefinition = true;
+          return 'variable';
+        }
+        state.isDefinition = false;
+        return 'def';
+      }
+      if (stream.match(/^({[^}]*})*\(/, false)) {
+        return callOrDef(stream, state);
+      }
+      state.leavingExpr = true;
       return 'variable';
     }
+
     // Handle non-detected items
     stream.next();
     return ERRORCLASS;
   }
 
+  function callOrDef(stream, state) {
+    var match = stream.match(/^(\(\s*)/);
+    if (match) {
+      if (state.firstParenPos < 0)
+        state.firstParenPos = state.scopes.length;
+      state.scopes.push('(');
+      state.charsAdvanced += match[1].length;
+    }
+    if (currentScope(state) == '(' && stream.match(/^\)/)) {
+      state.scopes.pop();
+      state.charsAdvanced += 1;
+      if (state.scopes.length <= state.firstParenPos) {
+        var isDefinition = stream.match(/^\s*?=(?!=)/, false);
+        stream.backUp(state.charsAdvanced);
+        state.firstParenPos = -1;
+        state.charsAdvanced = 0;
+        if (isDefinition)
+          return 'def';
+        return 'builtin';
+      }
+    }
+    // Unfortunately javascript does not support multiline strings, so we have
+    // to undo anything done upto here if a function call or definition splits
+    // over two or more lines.
+    if (stream.match(/^$/g, false)) {
+      stream.backUp(state.charsAdvanced);
+      while (state.scopes.length > state.firstParenPos + 1)
+        state.scopes.pop();
+      state.firstParenPos = -1;
+      state.charsAdvanced = 0;
+      return 'builtin';
+    }
+    state.charsAdvanced += stream.match(/^([^()]*)/)[1].length;
+    return callOrDef(stream, state);
+  }
+
   function tokenStringFactory(delimiter) {
-    while ('rub'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
+    while ('bruv'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
       delimiter = delimiter.substr(1);
     }
-    var singleline = delimiter.length == 1;
+    var singleline = delimiter == "'";
     var OUTCLASS = 'string';
 
     function tokenString(stream, state) {
@@ -245,45 +314,41 b' CodeMirror.defineMode("julia", function('
     return tokenString;
   }
 
-  function tokenLexer(stream, state) {
-    var style = state.tokenize(stream, state);
-    var current = stream.current();
-
-    // Handle '.' connected identifiers
-    if (current === '.') {
-      style = stream.match(identifiers, false) ? null : ERRORCLASS;
-      if (style === null && state.lastStyle === 'meta') {
-          // Apply 'meta' style to '.' connected identifiers when
-          // appropriate.
-        style = 'meta';
-      }
-      return style;
-    }
-
-    return style;
-  }
-
   var external = {
     startState: function() {
       return {
         tokenize: tokenBase,
         scopes: [],
-        leaving_expr: false
+        lastToken: null,
+        leavingExpr: false,
+        isDefinition: false,
+        charsAdvanced: 0,
+        firstParenPos: -1
       };
     },
 
     token: function(stream, state) {
-      var style = tokenLexer(stream, state);
-      state.lastStyle = style;
+      var style = state.tokenize(stream, state);
+      var current = stream.current();
+
+      if (current && style) {
+        state.lastToken = current;
+      }
+
+      // Handle '.' connected identifiers
+      if (current === '.') {
+        style = stream.match(identifiers, false) || stream.match(macro, false) ||
+                stream.match(/\(/, false) ? 'operator' : ERRORCLASS;
+      }
       return style;
     },
 
     indent: function(state, textAfter) {
       var delta = 0;
-      if(textAfter=="end" || textAfter=="]" || textAfter=="}" || textAfter=="else" || textAfter=="elseif" || textAfter=="catch" || textAfter=="finally") {
+      if (textAfter == "end" || textAfter == "]" || textAfter == "}" || textAfter == "else" || textAfter == "elseif" || textAfter == "catch" || textAfter == "finally") {
         delta = -1;
       }
-      return (state.scopes.length + delta) * 4;
+      return (state.scopes.length + delta) * _conf.indentUnit;
     },
 
     lineComment: "#",

rhodecode/public/js/mode/markdown/markdown.js

@@ -39,8 +39,10 b' CodeMirror.defineMode("markdown", functi'
   if (modeCfg.underscoresBreakWords === undefined)
     modeCfg.underscoresBreakWords = true;
 
-  // Turn on fenced code blocks? ("```" to start/end)
-  if (modeCfg.fencedCodeBlocks === undefined) modeCfg.fencedCodeBlocks = false;
+  // Use `fencedCodeBlocks` to configure fenced code blocks. false to
+  // disable, string to specify a precise regexp that the fence should
+  // match, and true to allow three or more backticks or tildes (as
+  // per CommonMark).
 
   // Turn on task lists? ("- [ ] " and "- [x] ")
   if (modeCfg.taskLists === undefined) modeCfg.taskLists = false;
@@ -49,32 +51,46 b' CodeMirror.defineMode("markdown", functi'
   if (modeCfg.strikethrough === undefined)
     modeCfg.strikethrough = false;
 
+  // Allow token types to be overridden by user-provided token types.
+  if (modeCfg.tokenTypeOverrides === undefined)
+    modeCfg.tokenTypeOverrides = {};
+
   var codeDepth = 0;
 
-  var header   = 'header'
-  ,   code     = 'comment'
-  ,   quote    = 'quote'
-  ,   list1    = 'variable-2'
-  ,   list2    = 'variable-3'
-  ,   list3    = 'keyword'
-  ,   hr       = 'hr'
-  ,   image    = 'tag'
-  ,   formatting = 'formatting'
-  ,   linkinline = 'link'
-  ,   linkemail = 'link'
-  ,   linktext = 'link'
-  ,   linkhref = 'string'
-  ,   em       = 'em'
-  ,   strong   = 'strong'
-  ,   strikethrough = 'strikethrough';
+  var tokenTypes = {
+    header: "header",
+    code: "comment",
+    quote: "quote",
+    list1: "variable-2",
+    list2: "variable-3",
+    list3: "keyword",
+    hr: "hr",
+    image: "tag",
+    formatting: "formatting",
+    linkInline: "link",
+    linkEmail: "link",
+    linkText: "link",
+    linkHref: "string",
+    em: "em",
+    strong: "strong",
+    strikethrough: "strikethrough"
+  };
+
+  for (var tokenType in tokenTypes) {
+    if (tokenTypes.hasOwnProperty(tokenType) && modeCfg.tokenTypeOverrides[tokenType]) {
+      tokenTypes[tokenType] = modeCfg.tokenTypeOverrides[tokenType];
+    }
+  }
 
   var hrRE = /^([*\-_])(?:\s*\1){2,}\s*$/
   ,   ulRE = /^[*\-+]\s+/
   ,   olRE = /^[0-9]+([.)])\s+/
   ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
-  ,   atxHeaderRE = /^(#+)(?: |$)/
+  ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
   ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
-  ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/;
+  ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/
+  ,   fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) +
+                                ")[ \\t]*([\\w+#]*)");
 
   function switchInline(stream, state, f) {
     state.f = state.inline = f;
@@ -86,6 +102,9 b' CodeMirror.defineMode("markdown", functi'
     return f(stream, state);
   }
 
+  function lineIsEmpty(line) {
+    return !line || !/\S/.test(line.string)
+  }
 
   // Blocks
 
@@ -110,7 +129,8 b' CodeMirror.defineMode("markdown", functi'
     state.trailingSpace = 0;
     state.trailingSpaceNewLine = false;
     // Mark this line as blank
-    state.thisLineHasContent = false;
+    state.prevLine = state.thisLine
+    state.thisLine = null
     return null;
   }
 
@@ -141,10 +161,10 b' CodeMirror.defineMode("markdown", functi'
     var match = null;
     if (state.indentationDiff >= 4) {
       stream.skipToEnd();
-      if (prevLineIsIndentedCode || !state.prevLineHasContent) {
+      if (prevLineIsIndentedCode || lineIsEmpty(state.prevLine)) {
         state.indentation -= 4;
         state.indentedCode = true;
-        return code;
+        return tokenTypes.code;
       } else {
         return null;
       }
@@ -155,7 +175,8 b' CodeMirror.defineMode("markdown", functi'
       if (modeCfg.highlightFormatting) state.formatting = "header";
       state.f = state.inline;
       return getType(state);
-    } else if (state.prevLineHasContent && !state.quote && !prevLineIsList && !prevLineIsIndentedCode && (match = stream.match(setextHeaderRE))) {
+    } else if (!lineIsEmpty(state.prevLine) && !state.quote && !prevLineIsList &&
+               !prevLineIsIndentedCode && (match = stream.match(setextHeaderRE))) {
       state.header = match[0].charAt(0) == '=' ? 1 : 2;
       if (modeCfg.highlightFormatting) state.formatting = "header";
       state.f = state.inline;
@@ -169,8 +190,8 b' CodeMirror.defineMode("markdown", functi'
       return switchInline(stream, state, footnoteLink);
     } else if (stream.match(hrRE, true)) {
       state.hr = true;
-      return hr;
-    } else if ((!state.prevLineHasContent || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) {
+      return tokenTypes.hr;
+    } else if ((lineIsEmpty(state.prevLine) || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) {
       var listType = null;
       if (stream.match(ulRE, true)) {
         listType = 'ul';
@@ -178,7 +199,7 b' CodeMirror.defineMode("markdown", functi'
         stream.match(olRE, true);
         listType = 'ol';
       }
-      state.indentation += 4;
+      state.indentation = stream.column() + stream.current().length;
       state.list = true;
       state.listDepth++;
       if (modeCfg.taskLists && stream.match(taskListRE, false)) {
@@ -187,9 +208,10 b' CodeMirror.defineMode("markdown", functi'
       state.f = state.inline;
       if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
       return getType(state);
-    } else if (modeCfg.fencedCodeBlocks && stream.match(/^```[ \t]*([\w+#]*)/, true)) {
+    } else if (modeCfg.fencedCodeBlocks && (match = stream.match(fencedCodeRE, true))) {
+      state.fencedChars = match[1]
       // try switching mode
-      state.localMode = getMode(RegExp.$1);
+      state.localMode = getMode(match[2]);
       if (state.localMode) state.localState = state.localMode.startState();
       state.f = state.block = local;
       if (modeCfg.highlightFormatting) state.formatting = "code-block";
@@ -202,7 +224,8 b' CodeMirror.defineMode("markdown", functi'
 
   function htmlBlock(stream, state) {
     var style = htmlMode.token(stream, state.htmlState);
-    if ((htmlFound && state.htmlState.tagStart === null && !state.htmlState.context) ||
+    if ((htmlFound && state.htmlState.tagStart === null &&
+         (!state.htmlState.context && state.htmlState.tokenize.isInText)) ||
         (state.md_inside && stream.current().indexOf(">") > -1)) {
       state.f = inlineNormal;
       state.block = blockNormal;
@@ -212,7 +235,7 b' CodeMirror.defineMode("markdown", functi'
   }
 
   function local(stream, state) {
-    if (stream.sol() && stream.match("```", false)) {
+    if (state.fencedChars && stream.match(state.fencedChars, false)) {
       state.localMode = state.localState = null;
       state.f = state.block = leavingLocal;
       return null;
@@ -220,14 +243,15 b' CodeMirror.defineMode("markdown", functi'
       return state.localMode.token(stream, state.localState);
     } else {
       stream.skipToEnd();
-      return code;
+      return tokenTypes.code;
     }
   }
 
   function leavingLocal(stream, state) {
-    stream.match("```");
+    stream.match(state.fencedChars);
     state.block = blockNormal;
     state.f = inlineNormal;
+    state.fencedChars = null;
     if (modeCfg.highlightFormatting) state.formatting = "code-block";
     state.code = true;
     var returnType = getType(state);
@@ -240,22 +264,22 b' CodeMirror.defineMode("markdown", functi'
     var styles = [];
 
     if (state.formatting) {
-      styles.push(formatting);
+      styles.push(tokenTypes.formatting);
 
       if (typeof state.formatting === "string") state.formatting = [state.formatting];
 
       for (var i = 0; i < state.formatting.length; i++) {
-        styles.push(formatting + "-" + state.formatting[i]);
+        styles.push(tokenTypes.formatting + "-" + state.formatting[i]);
 
         if (state.formatting[i] === "header") {
-          styles.push(formatting + "-" + state.formatting[i] + "-" + state.header);
+          styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.header);
         }
 
         // Add `formatting-quote` and `formatting-quote-#` for blockquotes
         // Add `error` instead if the maximum blockquote nesting depth is passed
         if (state.formatting[i] === "quote") {
           if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
-            styles.push(formatting + "-" + state.formatting[i] + "-" + state.quote);
+            styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.quote);
           } else {
             styles.push("error");
           }
@@ -273,38 +297,36 b' CodeMirror.defineMode("markdown", functi'
     }
 
     if (state.linkHref) {
-      styles.push(linkhref, "url");
+      styles.push(tokenTypes.linkHref, "url");
     } else { // Only apply inline styles to non-url text
-      if (state.strong) { styles.push(strong); }
-      if (state.em) { styles.push(em); }
-      if (state.strikethrough) { styles.push(strikethrough); }
-
-      if (state.linkText) { styles.push(linktext); }
-
-      if (state.code) { styles.push(code); }
+      if (state.strong) { styles.push(tokenTypes.strong); }
+      if (state.em) { styles.push(tokenTypes.em); }
+      if (state.strikethrough) { styles.push(tokenTypes.strikethrough); }
+      if (state.linkText) { styles.push(tokenTypes.linkText); }
+      if (state.code) { styles.push(tokenTypes.code); }
     }
 
-    if (state.header) { styles.push(header); styles.push(header + "-" + state.header); }
+    if (state.header) { styles.push(tokenTypes.header, tokenTypes.header + "-" + state.header); }
 
     if (state.quote) {
-      styles.push(quote);
+      styles.push(tokenTypes.quote);
 
       // Add `quote-#` where the maximum for `#` is modeCfg.maxBlockquoteDepth
       if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
-        styles.push(quote + "-" + state.quote);
+        styles.push(tokenTypes.quote + "-" + state.quote);
       } else {
-        styles.push(quote + "-" + modeCfg.maxBlockquoteDepth);
+        styles.push(tokenTypes.quote + "-" + modeCfg.maxBlockquoteDepth);
       }
     }
 
     if (state.list !== false) {
       var listMod = (state.listDepth - 1) % 3;
       if (!listMod) {
-        styles.push(list1);
+        styles.push(tokenTypes.list1);
       } else if (listMod === 1) {
-        styles.push(list2);
+        styles.push(tokenTypes.list2);
       } else {
-        styles.push(list3);
+        styles.push(tokenTypes.list3);
       }
     }
 
@@ -360,7 +382,8 b' CodeMirror.defineMode("markdown", functi'
       stream.next();
       if (modeCfg.highlightFormatting) {
         var type = getType(state);
-        return type ? type + " formatting-escape" : "formatting-escape";
+        var formattingEscape = tokenTypes.formatting + "-escape";
+        return type ? type + " " + formattingEscape : formattingEscape;
       }
     }
 
@@ -374,7 +397,7 b' CodeMirror.defineMode("markdown", functi'
       matchCh = (matchCh+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
       var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh;
       if (stream.match(new RegExp(regex), true)) {
-        return linkhref;
+        return tokenTypes.linkHref;
       }
     }
 
@@ -405,7 +428,7 b' CodeMirror.defineMode("markdown", functi'
     if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) {
       stream.match(/\[[^\]]*\]/);
       state.inline = state.f = linkHref;
-      return image;
+      return tokenTypes.image;
     }
 
     if (ch === '[' && stream.match(/.*\](\(.*\)| ?\[.*\])/, false)) {
@@ -431,7 +454,7 b' CodeMirror.defineMode("markdown", functi'
       } else {
         type = "";
       }
-      return type + linkinline;
+      return type + tokenTypes.linkInline;
     }
 
     if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, false)) {
@@ -443,15 +466,14 b' CodeMirror.defineMode("markdown", functi'
       } else {
         type = "";
       }
-      return type + linkemail;
+      return type + tokenTypes.linkEmail;
     }
 
-    if (ch === '<' && stream.match(/^\w/, false)) {
-      if (stream.string.indexOf(">") != -1) {
-        var atts = stream.string.substring(1,stream.string.indexOf(">"));
-        if (/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(atts)) {
-          state.md_inside = true;
-        }
+    if (ch === '<' && stream.match(/^(!--|\w)/, false)) {
+      var end = stream.string.indexOf(">", stream.pos);
+      if (end != -1) {
+        var atts = stream.string.substring(stream.start, end);
+        if (/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(atts)) state.md_inside = true;
       }
       stream.backUp(1);
       state.htmlState = CodeMirror.startState(htmlMode);
@@ -553,12 +575,12 b' CodeMirror.defineMode("markdown", functi'
       } else {
         type = "";
       }
-      return type + linkinline;
+      return type + tokenTypes.linkInline;
     }
 
     stream.match(/^[^>]+/, true);
 
-    return linkinline;
+    return tokenTypes.linkInline;
   }
 
   function linkHref(stream, state) {
@@ -598,7 +620,7 b' CodeMirror.defineMode("markdown", functi'
   }
 
   function footnoteLink(stream, state) {
-    if (stream.match(/^[^\]]*\]:/, false)) {
+    if (stream.match(/^([^\]\\]|\\.)*\]:/, false)) {
       state.f = footnoteLinkInside;
       stream.next(); // Consume [
       if (modeCfg.highlightFormatting) state.formatting = "link";
@@ -617,9 +639,9 b' CodeMirror.defineMode("markdown", functi'
       return returnType;
     }
 
-    stream.match(/^[^\]]+/, true);
+    stream.match(/^([^\]\\]|\\.)+/, true);
 
-    return linktext;
+    return tokenTypes.linkText;
   }
 
   function footnoteUrl(stream, state) {
@@ -636,7 +658,7 b' CodeMirror.defineMode("markdown", functi'
       stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
     }
     state.f = state.inline = inlineNormal;
-    return linkhref + " url";
+    return tokenTypes.linkHref + " url";
   }
 
   var savedInlineRE = [];
@@ -656,8 +678,8 b' CodeMirror.defineMode("markdown", functi'
       return {
         f: blockNormal,
 
-        prevLineHasContent: false,
-        thisLineHasContent: false,
+        prevLine: null,
+        thisLine: null,
 
         block: blockNormal,
         htmlState: null,
@@ -680,7 +702,8 b' CodeMirror.defineMode("markdown", functi'
         quote: 0,
         trailingSpace: 0,
         trailingSpaceNewLine: false,
-        strikethrough: false
+        strikethrough: false,
+        fencedChars: null
       };
     },
 
@@ -688,8 +711,8 b' CodeMirror.defineMode("markdown", functi'
       return {
         f: s.f,
 
-        prevLineHasContent: s.prevLineHasContent,
-        thisLineHasContent: s.thisLineHasContent,
+        prevLine: s.prevLine,
+        thisLine: s.thisLine,
 
         block: s.block,
         htmlState: s.htmlState && CodeMirror.copyState(htmlMode, s.htmlState),
@@ -702,6 +725,7 b' CodeMirror.defineMode("markdown", functi'
         text: s.text,
         formatting: false,
         linkTitle: s.linkTitle,
+        code: s.code,
         em: s.em,
         strong: s.strong,
         strikethrough: s.strikethrough,
@@ -714,7 +738,8 b' CodeMirror.defineMode("markdown", functi'
         indentedCode: s.indentedCode,
         trailingSpace: s.trailingSpace,
         trailingSpaceNewLine: s.trailingSpaceNewLine,
-        md_inside: s.md_inside
+        md_inside: s.md_inside,
+        fencedChars: s.fencedChars
       };
     },
 
@@ -723,28 +748,25 b' CodeMirror.defineMode("markdown", functi'
       // Reset state.formatting
       state.formatting = false;
 
-      if (stream.sol()) {
-        var forceBlankLine = !!state.header || state.hr;
+      if (stream != state.thisLine) {
+        var forceBlankLine = state.header || state.hr;
 
         // Reset state.header and state.hr
         state.header = 0;
         state.hr = false;
 
         if (stream.match(/^\s*$/, true) || forceBlankLine) {
-          state.prevLineHasContent = false;
           blankLine(state);
-          return forceBlankLine ? this.token(stream, state) : null;
-        } else {
-          state.prevLineHasContent = state.thisLineHasContent;
-          state.thisLineHasContent = true;
+          if (!forceBlankLine) return null
+          state.prevLine = null
         }
 
+        state.prevLine = state.thisLine
+        state.thisLine = stream
+
         // Reset state.taskList
         state.taskList = false;
 
-        // Reset state.code
-        state.code = false;
-
         // Reset state.trailingSpace
         state.trailingSpace = 0;
         state.trailingSpaceNewLine = false;

rhodecode/public/js/mode/meta.js

@@ -14,18 +14,22 b''
   CodeMirror.modeInfo = [
     {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
     {name: "PGP", mimes: ["application/pgp", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["pgp"]},
-    {name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn, asn1"]},
+    {name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn", "asn1"]},
     {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
+    {name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},
     {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
     {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
     {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
     {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
     {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
+    {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
+    {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
     {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
     {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
     {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
     {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
     {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
+    {name: "Crystal", mime: "text/x-crystal", mode: "crystal", ext: ["cr"]},
     {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
     {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
     {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
@@ -53,6 +57,7 b''
     {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy"]},
     {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
     {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
+    {name: "Haskell (Literate)", mime: "text/x-literate-haskell", mode: "haskell-literate", ext: ["lhs"]},
     {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
     {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
     {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
@@ -66,9 +71,10 b''
      mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
     {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
     {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
+    {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
     {name: "Jinja2", mime: "null", mode: "jinja2"},
     {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
-    {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin", ext: ["kt"]},
+    {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
     {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
     {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},
     {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},
@@ -81,10 +87,12 b''
     {name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
     {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
     {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
+    {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
     {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
     {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"]},
     {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
     {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
+    {name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},
     {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
     {name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
     {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
@@ -106,7 +114,7 b''
     {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
     {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
     {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
-    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"]},
+    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
     {name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]},
     {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
     {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
@@ -116,6 +124,7 b''
     {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
     {name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
     {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
+    {name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
     {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
     {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
     {name: "sTeX", mime: "text/x-stex", mode: "stex"},
@@ -137,10 +146,14 b''
     {name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ["vbs"]},
     {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
     {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
+    {name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
     {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
     {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
     {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
-    {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]}
+    {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
+    {name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
+    {name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]},
+    {name: "msgenny", mime: "text/x-msgenny", mode: "mscgen", ext: ["msgenny"]}
   ];
   // Ensure all modes have a mime property for backwards compatibility
   for (var i = 0; i < CodeMirror.modeInfo.length; i++) {

rhodecode/public/js/mode/meta_ext.js

@@ -113,7 +113,7 b' MIME_TO_EXT = {'
 "text/x-fortran": {"exts": ["*.f","*.f90","*.F","*.F90","*.for","*.f77"], "mode": "fortran"},
 "text/x-fsharp": {"exts": ["*.fs","*.fsi"], "mode": "mllike"},
 "text/x-gas": {"exts": ["*.s","*.S"], "mode": "gas"},
-"text/x-gfm": {"exts": ["*.md","*.MD"], "mode": "markdown"},
+"text/x-gfm": {"exts": ["*.md","*.MD"], "mode": "gfm"},
 "text/x-gherkin": {"exts": ["*.feature"], "mode": ""},
 "text/x-glslsrc": {"exts": ["*.vert","*.frag","*.geo"], "mode": ""},
 "text/x-gnuplot": {"exts": ["*.plot","*.plt"], "mode": ""},
@@ -137,11 +137,11 b' MIME_TO_EXT = {'
 "text/x-julia": {"exts": ["*.jl"], "mode": "julia"},
 "text/x-kconfig": {"exts": ["Kconfig","*Config.in*","external.in*","standard-modules.in"], "mode": ""},
 "text/x-koka": {"exts": ["*.kk","*.kki"], "mode": ""},
-"text/x-kotlin": {"exts": ["*.kt"], "mode": "kotlin"},
+"text/x-kotlin": {"exts": ["*.kt"], "mode": "clike"},
 "text/x-lasso": {"exts": ["*.lasso","*.lasso[89]"], "mode": ""},
 "text/x-latex": {"exts": ["*.ltx","*.text"], "mode": "stex"},
 "text/x-less": {"exts": ["*.less"], "mode": "css"},
-"text/x-literate-haskell": {"exts": ["*.lhs"], "mode": ""},
+"text/x-literate-haskell": {"exts": ["*.lhs"], "mode": "haskell-literate"},
 "text/x-livescript": {"exts": ["*.ls"], "mode": "livescript"},
 "text/x-llvm": {"exts": ["*.ll"], "mode": ""},
 "text/x-logos": {"exts": ["*.x","*.xi","*.xm","*.xmi"], "mode": ""},
@@ -162,7 +162,7 b' MIME_TO_EXT = {'
 "text/x-newspeak": {"exts": ["*.ns2"], "mode": ""},
 "text/x-nginx-conf": {"exts": ["*.conf"], "mode": "nginx"},
 "text/x-nimrod": {"exts": ["*.nim","*.nimrod"], "mode": ""},
-"text/x-nsis": {"exts": ["*.nsi","*.nsh"], "mode": ""},
+"text/x-nsis": {"exts": ["*.nsi","*.nsh"], "mode": "nsis"},
 "text/x-objdump": {"exts": ["*.objdump"], "mode": ""},
 "text/x-objective-c": {"exts": ["*.m","*.h"], "mode": ""},
 "text/x-objective-c++": {"exts": ["*.mm","*.hh"], "mode": ""},
@@ -217,7 +217,7 b' MIME_TO_EXT = {'
 "text/x-vb": {"exts": ["*.vb"], "mode": "vb"},
 "text/x-vbnet": {"exts": ["*.vb","*.bas"], "mode": ""},
 "text/x-verilog": {"exts": ["*.v"], "mode": "verilog"},
-"text/x-vhdl": {"exts": ["*.vhdl","*.vhd"], "mode": ""},
+"text/x-vhdl": {"exts": ["*.vhdl","*.vhd"], "mode": "vhdl"},
 "text/x-vim": {"exts": ["*.vim",".vimrc",".exrc",".gvimrc","_vimrc","_exrc","_gvimrc","vimrc","gvimrc"], "mode": ""},
 "text/x-windows-registry": {"exts": ["*.reg"], "mode": ""},
 "text/x-xtend": {"exts": ["*.xtend"], "mode": ""},

rhodecode/public/js/mode/nginx/nginx.js

@@ -173,6 +173,6 b' CodeMirror.defineMode("nginx", function('
   };
 });
 
-CodeMirror.defineMIME("text/nginx", "text/x-nginx-conf");
+CodeMirror.defineMIME("text/x-nginx-conf", "nginx");
 
 });

rhodecode/public/js/mode/php/php.js

@@ -86,7 +86,7 b''
     "die echo empty exit eval include include_once isset list require require_once return " +
     "print unset __halt_compiler self static parent yield insteadof finally";
   var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
-  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
+  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
   CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" "));
   CodeMirror.registerHelper("wordChars", "php", /[\w$]/);
 
@@ -105,14 +105,15 b''
         return "variable-2";
       },
       "<": function(stream, state) {
-        if (stream.match(/<</)) {
-          var nowDoc = stream.eat("'");
+        var before;
+        if (before = stream.match(/<<\s*/)) {
+          var quoted = stream.eat(/['"]/);
           stream.eatWhile(/[\w\.]/);
-          var delim = stream.current().slice(3 + (nowDoc ? 1 : 0));
-          if (nowDoc) stream.eat("'");
+          var delim = stream.current().slice(before[0].length + (quoted ? 2 : 1));
+          if (quoted) stream.eat(quoted);
           if (delim) {
             (state.tokStack || (state.tokStack = [])).push(delim, 0);
-            state.tokenize = phpString(delim, nowDoc ? false : true);
+            state.tokenize = phpString(delim, quoted != "'");
             return "string";
           }
         }
@@ -159,6 +160,7 b''
       if (!isPHP) {
         if (stream.match(/^<\?\w*/)) {
           state.curMode = phpMode;
+          if (!state.php) state.php = CodeMirror.startState(phpMode, htmlMode.indent(state.html, ""))
           state.curState = state.php;
           return "meta";
         }
@@ -182,6 +184,7 b''
       } else if (isPHP && state.php.tokenize == null && stream.match("?>")) {
         state.curMode = htmlMode;
         state.curState = state.html;
+        if (!state.php.context.prev) state.php = null;
         return "meta";
       } else {
         return phpMode.token(stream, state.curState);
@@ -190,7 +193,8 b''
 
     return {
       startState: function() {
-        var html = CodeMirror.startState(htmlMode), php = CodeMirror.startState(phpMode);
+        var html = CodeMirror.startState(htmlMode)
+        var php = parserConfig.startOpen ? CodeMirror.startState(phpMode) : null
         return {html: html,
                 php: php,
                 curMode: parserConfig.startOpen ? phpMode : htmlMode,
@@ -200,7 +204,7 b''
 
       copyState: function(state) {
         var html = state.html, htmlNew = CodeMirror.copyState(htmlMode, html),
-            php = state.php, phpNew = CodeMirror.copyState(phpMode, php), cur;
+            php = state.php, phpNew = php && CodeMirror.copyState(phpMode, php), cur;
         if (state.curMode == htmlMode) cur = htmlNew;
         else cur = phpNew;
         return {html: htmlNew, php: phpNew, curMode: state.curMode, curState: cur,

rhodecode/public/js/mode/python/python.js

@@ -48,18 +48,18 b''
   CodeMirror.defineMode("python", function(conf, parserConf) {
     var ERRORCLASS = "error";
 
-    var singleDelimiters = parserConf.singleDelimiters || new RegExp("^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]");
-    var doubleOperators = parserConf.doubleOperators || new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");
-    var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
-    var tripleDelimiters = parserConf.tripleDelimiters || new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
+    var singleDelimiters = parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.]/;
+    var doubleOperators = parserConf.doubleOperators || /^([!<>]==|<>|<<|>>|\/\/|\*\*)/;
+    var doubleDelimiters = parserConf.doubleDelimiters || /^(\+=|\-=|\*=|%=|\/=|&=|\|=|\^=)/;
+    var tripleDelimiters = parserConf.tripleDelimiters || /^(\/\/=|>>=|<<=|\*\*=)/;
 
     if (parserConf.version && parseInt(parserConf.version, 10) == 3){
         // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
-        var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!@]");
-        var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*");
+        var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!@]/;
+        var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
     } else {
-        var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");
-        var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+        var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!]/;
+        var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*/;
     }
 
     var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
@@ -160,13 +160,16 b''
 
       // Handle operators and Delimiters
       if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters))
-        return null;
+        return "punctuation";
 
       if (stream.match(doubleOperators) || stream.match(singleOperators))
         return "operator";
 
       if (stream.match(singleDelimiters))
-        return null;
+        return "punctuation";
+
+      if (state.lastToken == "." && stream.match(identifiers))
+        return "property";
 
       if (stream.match(keywords) || stream.match(wordOperators))
         return "keyword";
@@ -246,17 +249,6 b''
       var style = state.tokenize(stream, state);
       var current = stream.current();
 
-      // Handle '.' connected identifiers
-      if (current == ".") {
-        style = stream.match(identifiers, false) ? null : ERRORCLASS;
-        if (style == null && state.lastStyle == "meta") {
-          // Apply 'meta' style to '.' connected identifiers when
-          // appropriate.
-          style = "meta";
-        }
-        return style;
-      }
-
       // Handle decorators
       if (current == "@"){
         if(parserConf.version && parseInt(parserConf.version, 10) == 3){
@@ -267,7 +259,7 b''
       }
 
       if ((style == "variable" || style == "builtin")
-          && state.lastStyle == "meta")
+          && state.lastToken == "meta")
         style = "meta";
 
       // Handle scope changes.
@@ -300,7 +292,6 b''
         return {
           tokenize: tokenBase,
           scopes: [{offset: basecolumn || 0, type: "py", align: null}],
-          lastStyle: null,
           lastToken: null,
           lambda: false,
           dedent: 0
@@ -312,11 +303,9 b''
         if (addErr) state.errorToken = false;
         var style = tokenLexer(stream, state);
 
-        state.lastStyle = style;
-
-        var current = stream.current();
-        if (current && style)
-          state.lastToken = current;
+        if (style && style != "comment")
+          state.lastToken = (style == "keyword" || style == "punctuation") ? stream.current() : style;
+        if (style == "punctuation") style = null;
 
         if (stream.eol() && state.lambda)
           state.lambda = false;

rhodecode/public/js/mode/rpm/rpm.js

@@ -34,10 +34,10 b' CodeMirror.defineMIME("text/x-rpm-change'
 // Quick and dirty spec file highlighting
 
 CodeMirror.defineMode("rpm-spec", function() {
-  var arch = /^(i386|i586|i686|x86_64|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/;
+  var arch = /^(i386|i586|i686|x86_64|ppc64le|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/;
 
-  var preamble = /^(Name|Version|Release|License|Summary|Url|Group|Source|BuildArch|BuildRequires|BuildRoot|AutoReqProv|Provides|Requires(\(\w+\))?|Obsoletes|Conflicts|Recommends|Source\d*|Patch\d*|ExclusiveArch|NoSource|Supplements):/;
-  var section = /^%(debug_package|package|description|prep|build|install|files|clean|changelog|preinstall|preun|postinstall|postun|pre|post|triggerin|triggerun|pretrans|posttrans|verifyscript|check|triggerpostun|triggerprein|trigger)/;
+  var preamble = /^[a-zA-Z0-9()]+:/;
+  var section = /^%(debug_package|package|description|prep|build|install|files|clean|changelog|preinstall|preun|postinstall|postun|pretrans|posttrans|pre|post|triggerin|triggerun|verifyscript|check|triggerpostun|triggerprein|trigger)/;
   var control_flow_complex = /^%(ifnarch|ifarch|if)/; // rpm control flow macros
   var control_flow_simple = /^%(else|endif)/; // rpm control flow macros
   var operators = /^(\!|\?|\<\=|\<|\>\=|\>|\=\=|\&\&|\|\|)/; // operators in control flow macros
@@ -55,8 +55,8 b' CodeMirror.defineMode("rpm-spec", functi'
       if (ch == "#") { stream.skipToEnd(); return "comment"; }
 
       if (stream.sol()) {
-        if (stream.match(preamble)) { return "preamble"; }
-        if (stream.match(section)) { return "section"; }
+        if (stream.match(preamble)) { return "header"; }
+        if (stream.match(section)) { return "atom"; }
       }
 
       if (stream.match(/^\$\w+/)) { return "def"; } // Variables like '$RPM_BUILD_ROOT'
@@ -73,21 +73,29 b' CodeMirror.defineMode("rpm-spec", functi'
         if (stream.eol()) { state.controlFlow = false; }
       }
 
-      if (stream.match(arch)) { return "number"; }
+      if (stream.match(arch)) {
+        if (stream.eol()) { state.controlFlow = false; }
+        return "number";
+      }
 
       // Macros like '%make_install' or '%attr(0775,root,root)'
       if (stream.match(/^%[\w]+/)) {
         if (stream.match(/^\(/)) { state.macroParameters = true; }
-        return "macro";
+        return "keyword";
       }
       if (state.macroParameters) {
         if (stream.match(/^\d+/)) { return "number";}
         if (stream.match(/^\)/)) {
           state.macroParameters = false;
-          return "macro";
+          return "keyword";
         }
       }
-      if (stream.match(/^%\{\??[\w \-]+\}/)) { return "macro"; } // Macros like '%{defined fedora}'
+
+      // Macros like '%{defined fedora}'
+      if (stream.match(/^%\{\??[\w \-\:\!]+\}/)) {
+        if (stream.eol()) { state.controlFlow = false; }
+        return "def";
+      }
 
       //TODO: Include bash script sub-parser (CodeMirror supports that)
       stream.next();

rhodecode/public/js/mode/ruby/ruby.js

@@ -25,7 +25,7 b' CodeMirror.defineMode("ruby", function(c'
     "caller", "lambda", "proc", "public", "protected", "private", "require", "load",
     "require_relative", "extend", "autoload", "__END__", "__FILE__", "__LINE__", "__dir__"
   ]);
-  var indentWords = wordObj(["def", "class", "case", "for", "while", "module", "then",
+  var indentWords = wordObj(["def", "class", "case", "for", "while", "until", "module", "then",
                              "catch", "loop", "proc", "begin"]);
   var dedentWords = wordObj(["end", "until"]);
   var matching = {"[": "]", "{": "}", "(": ")"};
@@ -37,7 +37,6 b' CodeMirror.defineMode("ruby", function(c'
   }
 
   function tokenBase(stream, state) {
-    curPunc = null;
     if (stream.sol() && stream.match("=begin") && stream.eol()) {
       state.tokenize.push(readBlockComment);
       return "comment";
@@ -232,6 +231,7 b' CodeMirror.defineMode("ruby", function(c'
     },
 
     token: function(stream, state) {
+      curPunc = null;
       if (stream.sol()) state.indented = stream.indentation();
       var style = state.tokenize[state.tokenize.length-1](stream, state), kwtype;
       var thisTok = curPunc;
@@ -275,7 +275,7 b' CodeMirror.defineMode("ruby", function(c'
         (state.continuedLine ? config.indentUnit : 0);
     },
 
-    electricChars: "}de", // enD and rescuE
+    electricInput: /^\s*(?:end|rescue|\})$/,
     lineComment: "#"
   };
 });

rhodecode/public/js/mode/rust/rust.js

@@ -3,449 +3,69 b''
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
 "use strict";
 
-CodeMirror.defineMode("rust", function() {
-  var indentUnit = 4, altIndentUnit = 2;
-  var valKeywords = {
-    "if": "if-style", "while": "if-style", "loop": "else-style", "else": "else-style",
-    "do": "else-style", "ret": "else-style", "fail": "else-style",
-    "break": "atom", "cont": "atom", "const": "let", "resource": "fn",
-    "let": "let", "fn": "fn", "for": "for", "alt": "alt", "iface": "iface",
-    "impl": "impl", "type": "type", "enum": "enum", "mod": "mod",
-    "as": "op", "true": "atom", "false": "atom", "assert": "op", "check": "op",
-    "claim": "op", "native": "ignore", "unsafe": "ignore", "import": "else-style",
-    "export": "else-style", "copy": "op", "log": "op", "log_err": "op",
-    "use": "op", "bind": "op", "self": "atom", "struct": "enum"
-  };
-  var typeKeywords = function() {
-    var keywords = {"fn": "fn", "block": "fn", "obj": "obj"};
-    var atoms = "bool uint int i8 i16 i32 i64 u8 u16 u32 u64 float f32 f64 str char".split(" ");
-    for (var i = 0, e = atoms.length; i < e; ++i) keywords[atoms[i]] = "atom";
-    return keywords;
-  }();
-  var operatorChar = /[+\-*&%=<>!?|\.@]/;
-
-  // Tokenizer
-
-  // Used as scratch variable to communicate multiple values without
-  // consing up tons of objects.
-  var tcat, content;
-  function r(tc, style) {
-    tcat = tc;
-    return style;
-  }
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"') {
-      state.tokenize = tokenString;
-      return state.tokenize(stream, state);
-    }
-    if (ch == "'") {
-      tcat = "atom";
-      if (stream.eat("\\")) {
-        if (stream.skipTo("'")) { stream.next(); return "string"; }
-        else { return "error"; }
-      } else {
-        stream.next();
-        return stream.eat("'") ? "string" : "error";
-      }
-    }
-    if (ch == "/") {
-      if (stream.eat("/")) { stream.skipToEnd(); return "comment"; }
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment(1);
-        return state.tokenize(stream, state);
-      }
-    }
-    if (ch == "#") {
-      if (stream.eat("[")) { tcat = "open-attr"; return null; }
-      stream.eatWhile(/\w/);
-      return r("macro", "meta");
-    }
-    if (ch == ":" && stream.match(":<")) {
-      return r("op", null);
-    }
-    if (ch.match(/\d/) || (ch == "." && stream.eat(/\d/))) {
-      var flp = false;
-      if (!stream.match(/^x[\da-f]+/i) && !stream.match(/^b[01]+/)) {
-        stream.eatWhile(/\d/);
-        if (stream.eat(".")) { flp = true; stream.eatWhile(/\d/); }
-        if (stream.match(/^e[+\-]?\d+/i)) { flp = true; }
-      }
-      if (flp) stream.match(/^f(?:32|64)/);
-      else stream.match(/^[ui](?:8|16|32|64)/);
-      return r("atom", "number");
-    }
-    if (ch.match(/[()\[\]{}:;,]/)) return r(ch, null);
-    if (ch == "-" && stream.eat(">")) return r("->", null);
-    if (ch.match(operatorChar)) {
-      stream.eatWhile(operatorChar);
-      return r("op", null);
-    }
-    stream.eatWhile(/\w/);
-    content = stream.current();
-    if (stream.match(/^::\w/)) {
-      stream.backUp(1);
-      return r("prefix", "variable-2");
-    }
-    if (state.keywords.propertyIsEnumerable(content))
-      return r(state.keywords[content], content.match(/true|false/) ? "atom" : "keyword");
-    return r("name", "variable");
-  }
-
-  function tokenString(stream, state) {
-    var ch, escaped = false;
-    while (ch = stream.next()) {
-      if (ch == '"' && !escaped) {
-        state.tokenize = tokenBase;
-        return r("atom", "string");
-      }
-      escaped = !escaped && ch == "\\";
-    }
-    // Hack to not confuse the parser when a string is split in
-    // pieces.
-    return r("op", "string");
-  }
-
-  function tokenComment(depth) {
-    return function(stream, state) {
-      var lastCh = null, ch;
-      while (ch = stream.next()) {
-        if (ch == "/" && lastCh == "*") {
-          if (depth == 1) {
-            state.tokenize = tokenBase;
-            break;
-          } else {
-            state.tokenize = tokenComment(depth - 1);
-            return state.tokenize(stream, state);
-          }
-        }
-        if (ch == "*" && lastCh == "/") {
-          state.tokenize = tokenComment(depth + 1);
-          return state.tokenize(stream, state);
-        }
-        lastCh = ch;
-      }
-      return "comment";
-    };
-  }
-
-  // Parser
-
-  var cx = {state: null, stream: null, marked: null, cc: null};
-  function pass() {
-    for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-
-  function pushlex(type, info) {
-    var result = function() {
-      var state = cx.state;
-      state.lexical = {indented: state.indented, column: cx.stream.column(),
-                       type: type, prev: state.lexical, info: info};
-    };
-    result.lex = true;
-    return result;
-  }
-  function poplex() {
-    var state = cx.state;
-    if (state.lexical.prev) {
-      if (state.lexical.type == ")")
-        state.indented = state.lexical.indented;
-      state.lexical = state.lexical.prev;
-    }
-  }
-  function typecx() { cx.state.keywords = typeKeywords; }
-  function valcx() { cx.state.keywords = valKeywords; }
-  poplex.lex = typecx.lex = valcx.lex = true;
-
-  function commasep(comb, end) {
-    function more(type) {
-      if (type == ",") return cont(comb, more);
-      if (type == end) return cont();
-      return cont(more);
-    }
-    return function(type) {
-      if (type == end) return cont();
-      return pass(comb, more);
-    };
-  }
+CodeMirror.defineSimpleMode("rust",{
+  start: [
+    // string and byte string
+    {regex: /b?"/, token: "string", next: "string"},
+    // raw string and raw byte string
+    {regex: /b?r"/, token: "string", next: "string_raw"},
+    {regex: /b?r#+"/, token: "string", next: "string_raw_hash"},
+    // character
+    {regex: /'(?:[^'\\]|\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\}))'/, token: "string-2"},
+    // byte
+    {regex: /b'(?:[^']|\\(?:['\\nrt0]|x[\da-fA-F]{2}))'/, token: "string-2"},
 
-  function stat_of(comb, tag) {
-    return cont(pushlex("stat", tag), comb, poplex, block);
-  }
-  function block(type) {
-    if (type == "}") return cont();
-    if (type == "let") return stat_of(letdef1, "let");
-    if (type == "fn") return stat_of(fndef);
-    if (type == "type") return cont(pushlex("stat"), tydef, endstatement, poplex, block);
-    if (type == "enum") return stat_of(enumdef);
-    if (type == "mod") return stat_of(mod);
-    if (type == "iface") return stat_of(iface);
-    if (type == "impl") return stat_of(impl);
-    if (type == "open-attr") return cont(pushlex("]"), commasep(expression, "]"), poplex);
-    if (type == "ignore" || type.match(/[\]\);,]/)) return cont(block);
-    return pass(pushlex("stat"), expression, poplex, endstatement, block);
-  }
-  function endstatement(type) {
-    if (type == ";") return cont();
-    return pass();
-  }
-  function expression(type) {
-    if (type == "atom" || type == "name") return cont(maybeop);
-    if (type == "{") return cont(pushlex("}"), exprbrace, poplex);
-    if (type.match(/[\[\(]/)) return matchBrackets(type, expression);
-    if (type.match(/[\]\)\};,]/)) return pass();
-    if (type == "if-style") return cont(expression, expression);
-    if (type == "else-style" || type == "op") return cont(expression);
-    if (type == "for") return cont(pattern, maybetype, inop, expression, expression);
-    if (type == "alt") return cont(expression, altbody);
-    if (type == "fn") return cont(fndef);
-    if (type == "macro") return cont(macro);
-    return cont();
-  }
-  function maybeop(type) {
-    if (content == ".") return cont(maybeprop);
-    if (content == "::<"){return cont(typarams, maybeop);}
-    if (type == "op" || content == ":") return cont(expression);
-    if (type == "(" || type == "[") return matchBrackets(type, expression);
-    return pass();
-  }
-  function maybeprop() {
-    if (content.match(/^\w+$/)) {cx.marked = "variable"; return cont(maybeop);}
-    return pass(expression);
-  }
-  function exprbrace(type) {
-    if (type == "op") {
-      if (content == "|") return cont(blockvars, poplex, pushlex("}", "block"), block);
-      if (content == "||") return cont(poplex, pushlex("}", "block"), block);
-    }
-    if (content == "mutable" || (content.match(/^\w+$/) && cx.stream.peek() == ":"
-                                 && !cx.stream.match("::", false)))
-      return pass(record_of(expression));
-    return pass(block);
-  }
-  function record_of(comb) {
-    function ro(type) {
-      if (content == "mutable" || content == "with") {cx.marked = "keyword"; return cont(ro);}
-      if (content.match(/^\w*$/)) {cx.marked = "variable"; return cont(ro);}
-      if (type == ":") return cont(comb, ro);
-      if (type == "}") return cont();
-      return cont(ro);
-    }
-    return ro;
-  }
-  function blockvars(type) {
-    if (type == "name") {cx.marked = "def"; return cont(blockvars);}
-    if (type == "op" && content == "|") return cont();
-    return cont(blockvars);
-  }
-
-  function letdef1(type) {
-    if (type.match(/[\]\)\};]/)) return cont();
-    if (content == "=") return cont(expression, letdef2);
-    if (type == ",") return cont(letdef1);
-    return pass(pattern, maybetype, letdef1);
-  }
-  function letdef2(type) {
-    if (type.match(/[\]\)\};,]/)) return pass(letdef1);
-    else return pass(expression, letdef2);
-  }
-  function maybetype(type) {
-    if (type == ":") return cont(typecx, rtype, valcx);
-    return pass();
-  }
-  function inop(type) {
-    if (type == "name" && content == "in") {cx.marked = "keyword"; return cont();}
-    return pass();
-  }
-  function fndef(type) {
-    if (content == "@" || content == "~") {cx.marked = "keyword"; return cont(fndef);}
-    if (type == "name") {cx.marked = "def"; return cont(fndef);}
-    if (content == "<") return cont(typarams, fndef);
-    if (type == "{") return pass(expression);
-    if (type == "(") return cont(pushlex(")"), commasep(argdef, ")"), poplex, fndef);
-    if (type == "->") return cont(typecx, rtype, valcx, fndef);
-    if (type == ";") return cont();
-    return cont(fndef);
-  }
-  function tydef(type) {
-    if (type == "name") {cx.marked = "def"; return cont(tydef);}
-    if (content == "<") return cont(typarams, tydef);
-    if (content == "=") return cont(typecx, rtype, valcx);
-    return cont(tydef);
-  }
-  function enumdef(type) {
-    if (type == "name") {cx.marked = "def"; return cont(enumdef);}
-    if (content == "<") return cont(typarams, enumdef);
-    if (content == "=") return cont(typecx, rtype, valcx, endstatement);
-    if (type == "{") return cont(pushlex("}"), typecx, enumblock, valcx, poplex);
-    return cont(enumdef);
-  }
-  function enumblock(type) {
-    if (type == "}") return cont();
-    if (type == "(") return cont(pushlex(")"), commasep(rtype, ")"), poplex, enumblock);
-    if (content.match(/^\w+$/)) cx.marked = "def";
-    return cont(enumblock);
-  }
-  function mod(type) {
-    if (type == "name") {cx.marked = "def"; return cont(mod);}
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    return pass();
-  }
-  function iface(type) {
-    if (type == "name") {cx.marked = "def"; return cont(iface);}
-    if (content == "<") return cont(typarams, iface);
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    return pass();
-  }
-  function impl(type) {
-    if (content == "<") return cont(typarams, impl);
-    if (content == "of" || content == "for") {cx.marked = "keyword"; return cont(rtype, impl);}
-    if (type == "name") {cx.marked = "def"; return cont(impl);}
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    return pass();
-  }
-  function typarams() {
-    if (content == ">") return cont();
-    if (content == ",") return cont(typarams);
-    if (content == ":") return cont(rtype, typarams);
-    return pass(rtype, typarams);
-  }
-  function argdef(type) {
-    if (type == "name") {cx.marked = "def"; return cont(argdef);}
-    if (type == ":") return cont(typecx, rtype, valcx);
-    return pass();
-  }
-  function rtype(type) {
-    if (type == "name") {cx.marked = "variable-3"; return cont(rtypemaybeparam); }
-    if (content == "mutable") {cx.marked = "keyword"; return cont(rtype);}
-    if (type == "atom") return cont(rtypemaybeparam);
-    if (type == "op" || type == "obj") return cont(rtype);
-    if (type == "fn") return cont(fntype);
-    if (type == "{") return cont(pushlex("{"), record_of(rtype), poplex);
-    return matchBrackets(type, rtype);
-  }
-  function rtypemaybeparam() {
-    if (content == "<") return cont(typarams);
-    return pass();
-  }
-  function fntype(type) {
-    if (type == "(") return cont(pushlex("("), commasep(rtype, ")"), poplex, fntype);
-    if (type == "->") return cont(rtype);
-    return pass();
-  }
-  function pattern(type) {
-    if (type == "name") {cx.marked = "def"; return cont(patternmaybeop);}
-    if (type == "atom") return cont(patternmaybeop);
-    if (type == "op") return cont(pattern);
-    if (type.match(/[\]\)\};,]/)) return pass();
-    return matchBrackets(type, pattern);
-  }
-  function patternmaybeop(type) {
-    if (type == "op" && content == ".") return cont();
-    if (content == "to") {cx.marked = "keyword"; return cont(pattern);}
-    else return pass();
-  }
-  function altbody(type) {
-    if (type == "{") return cont(pushlex("}", "alt"), altblock1, poplex);
-    return pass();
-  }
-  function altblock1(type) {
-    if (type == "}") return cont();
-    if (type == "|") return cont(altblock1);
-    if (content == "when") {cx.marked = "keyword"; return cont(expression, altblock2);}
-    if (type.match(/[\]\);,]/)) return cont(altblock1);
-    return pass(pattern, altblock2);
-  }
-  function altblock2(type) {
-    if (type == "{") return cont(pushlex("}", "alt"), block, poplex, altblock1);
-    else return pass(altblock1);
-  }
-
-  function macro(type) {
-    if (type.match(/[\[\(\{]/)) return matchBrackets(type, expression);
-    return pass();
-  }
-  function matchBrackets(type, comb) {
-    if (type == "[") return cont(pushlex("]"), commasep(comb, "]"), poplex);
-    if (type == "(") return cont(pushlex(")"), commasep(comb, ")"), poplex);
-    if (type == "{") return cont(pushlex("}"), commasep(comb, "}"), poplex);
-    return cont();
-  }
-
-  function parse(state, stream, style) {
-    var cc = state.cc;
-    // Communicate our context to the combinators.
-    // (Less wasteful than consing up a hundred closures on every call.)
-    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc;
-
-    while (true) {
-      var combinator = cc.length ? cc.pop() : block;
-      if (combinator(tcat)) {
-        while(cc.length && cc[cc.length - 1].lex)
-          cc.pop()();
-        return cx.marked || style;
-      }
-    }
-  }
-
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase,
-        cc: [],
-        lexical: {indented: -indentUnit, column: 0, type: "top", align: false},
-        keywords: valKeywords,
-        indented: 0
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (!state.lexical.hasOwnProperty("align"))
-          state.lexical.align = false;
-        state.indented = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-      tcat = content = null;
-      var style = state.tokenize(stream, state);
-      if (style == "comment") return style;
-      if (!state.lexical.hasOwnProperty("align"))
-        state.lexical.align = true;
-      if (tcat == "prefix") return style;
-      if (!content) content = stream.current();
-      return parse(state, stream, style);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical,
-          type = lexical.type, closing = firstChar == type;
-      if (type == "stat") return lexical.indented + indentUnit;
-      if (lexical.align) return lexical.column + (closing ? 0 : 1);
-      return lexical.indented + (closing ? 0 : (lexical.info == "alt" ? altIndentUnit : indentUnit));
-    },
-
-    electricChars: "{}",
+    {regex: /(?:(?:[0-9][0-9_]*)(?:(?:[Ee][+-]?[0-9_]+)|\.[0-9_]+(?:[Ee][+-]?[0-9_]+)?)(?:f32|f64)?)|(?:0(?:b[01_]+|(?:o[0-7_]+)|(?:x[0-9a-fA-F_]+))|(?:[0-9][0-9_]*))(?:u8|u16|u32|u64|i8|i16|i32|i64|isize|usize)?/,
+     token: "number"},
+    {regex: /(let(?:\s+mut)?|fn|enum|mod|struct|type)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/, token: ["keyword", null, "def"]},
+    {regex: /(?:abstract|alignof|as|box|break|continue|const|crate|do|else|enum|extern|fn|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/, token: "keyword"},
+    {regex: /\b(?:Self|isize|usize|char|bool|u8|u16|u32|u64|f16|f32|f64|i8|i16|i32|i64|str|Option)\b/, token: "atom"},
+    {regex: /\b(?:true|false|Some|None|Ok|Err)\b/, token: "builtin"},
+    {regex: /\b(fn)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,
+     token: ["keyword", null ,"def"]},
+    {regex: /#!?\[.*\]/, token: "meta"},
+    {regex: /\/\/.*/, token: "comment"},
+    {regex: /\/\*/, token: "comment", next: "comment"},
+    {regex: /[-+\/*=<>!]+/, token: "operator"},
+    {regex: /[a-zA-Z_]\w*!/,token: "variable-3"},
+    {regex: /[a-zA-Z_]\w*/, token: "variable"},
+    {regex: /[\{\[\(]/, indent: true},
+    {regex: /[\}\]\)]/, dedent: true}
+  ],
+  string: [
+    {regex: /"/, token: "string", next: "start"},
+    {regex: /(?:[^\\"]|\\(?:.|$))*/, token: "string"}
+  ],
+  string_raw: [
+    {regex: /"/, token: "string", next: "start"},
+    {regex: /[^"]*/, token: "string"}
+  ],
+  string_raw_hash: [
+    {regex: /"#+/, token: "string", next: "start"},
+    {regex: /(?:[^"]|"(?!#))*/, token: "string"}
+  ],
+  comment: [
+    {regex: /.*?\*\//, token: "comment", next: "start"},
+    {regex: /.*/, token: "comment"}
+  ],
+  meta: {
+    dontIndentStates: ["comment"],
+    electricInput: /^\s*\}$/,
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
     lineComment: "//",
     fold: "brace"
-  };
+  }
 });
 
+
 CodeMirror.defineMIME("text/x-rustsrc", "rust");
-
 });

rhodecode/public/js/mode/sparql/sparql.js

@@ -165,7 +165,9 b' CodeMirror.defineMode("sparql", function'
         return context.col + (closing ? 0 : 1);
       else
         return context.indent + (closing ? 0 : indentUnit);
-    }
+    },
+
+    lineComment: "#"
   };
 });
 

rhodecode/public/js/mode/sql/sql.js

@@ -257,7 +257,7 b' CodeMirror.defineMode("sql", function(co'
   }
 
   // these keywords are used by all SQL dialects (however, a mode can still overwrite it)
-  var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where ";
+  var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where limit";
 
   // turn a space-separated list into an array
   function set(str) {

rhodecode/public/js/mode/stylus/stylus.js

@@ -126,19 +126,16 b''
       if (stream.match(/^&{1}\s*$/)) {
         return ["variable-3", "reference"];
       }
-      // Variable
-      if (ch == "$" && stream.match(/^\$[\w-]+/i)) {
-        return ["variable-2", "variable-name"];
-      }
       // Word operator
       if (stream.match(wordOperatorKeywordsRegexp)) {
         return ["operator", "operator"];
       }
       // Word
-      if (stream.match(/^[-_]*[a-z0-9]+[\w-]*/i)) {
+      if (stream.match(/^\$?[-_]*[a-z0-9]+[\w-]*/i)) {
+        // Variable
         if (stream.match(/^(\.|\[)[\w-\'\"\]]+/i, false)) {
           if (!wordIsTag(stream.current())) {
-            stream.match(/[\w-]+/);
+            stream.match(/\./);
             return ["variable-2", "variable-name"];
           }
         }
@@ -323,7 +320,7 b''
         return pushContext(state, stream, "block", 0);
       }
       if (type == "variable-name") {
-        if ((stream.indentation() == 0 && startOfLine(stream)) || wordIsBlock(firstWordOfLine(stream))) {
+        if (stream.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/) || wordIsBlock(firstWordOfLine(stream))) {
           return pushContext(state, stream, "variableName");
         }
         else {
@@ -429,6 +426,11 b''
           return pushContext(state, stream, "block");
         }
         if (word == "return") return pushContext(state, stream, "block", 0);
+
+        // Placeholder selector
+        if (override == "variable-2" && stream.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/)) {
+          return pushContext(state, stream, "block");
+        }
       }
       return state.context.type;
     };
@@ -639,7 +641,6 b''
     states.variableName = function(type, stream, state) {
       if (type == "string" || type == "[" || type == "]" || stream.current().match(/^(\.|\$)/)) {
         if (stream.current().match(/^\.[\w-]+/i)) override = "variable-2";
-        if (endOfLine(stream)) return popContext(state);
         return "variableName";
       }
       return popAndPass(type, stream, state);
@@ -735,7 +736,7 b''
   var nonStandardPropertyKeywords_ = ["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"];
   var fontProperties_ = ["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"];
   var colorKeywords_ = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
-  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale"];
+  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around"];
 
   var wordOperatorKeywords_ = ["in","and","or","not","is not","is a","is","isnt","defined","if unless"],
       blockKeywords_ = ["for","if","else","unless", "from", "to"],

rhodecode/public/js/mode/swift/swift.js

@@ -13,189 +13,188 b''
 })(function(CodeMirror) {
   "use strict"
 
-  function trim(str) { return /^\s*(.*?)\s*$/.exec(str)[1] }
-
-  var separators = [" ","\\\+","\\\-","\\\(","\\\)","\\\*","/",":","\\\?","\\\<","\\\>"," ","\\\."]
-  var tokens = new RegExp(separators.join("|"),"g")
-
-  function getWord(string, pos) {
-    var index = -1, count = 1
-    var words = string.split(tokens)
-    for (var i = 0; i < words.length; i++) {
-      for(var j = 1; j <= words[i].length; j++) {
-        if (count==pos) index = i
-        count++
-      }
-      count++
-    }
-    var ret = ["", ""]
-    if (pos == 0) {
-      ret[1] = words[0]
-      ret[0] = null
-    } else {
-      ret[1] = words[index]
-      ret[0] = words[index-1]
-    }
-    return ret
+  function wordSet(words) {
+    var set = {}
+    for (var i = 0; i < words.length; i++) set[words[i]] = true
+    return set
   }
 
-  CodeMirror.defineMode("swift", function() {
-    var keywords=["var","let","class","deinit","enum","extension","func","import","init","let","protocol","static","struct","subscript","typealias","var","as","dynamicType","is","new","super","self","Self","Type","__COLUMN__","__FILE__","__FUNCTION__","__LINE__","break","case","continue","default","do","else","fallthrough","if","in","for","return","switch","where","while","associativity","didSet","get","infix","inout","left","mutating","none","nonmutating","operator","override","postfix","precedence","prefix","right","set","unowned","unowned(safe)","unowned(unsafe)","weak","willSet"]
-    var commonConstants=["Infinity","NaN","undefined","null","true","false","on","off","yes","no","nil","null","this","super"]
-    var types=["String","bool","int","string","double","Double","Int","Float","float","public","private","extension"]
-    var numbers=["0","1","2","3","4","5","6","7","8","9"]
-    var operators=["+","-","/","*","%","=","|","&","<",">"]
-    var punc=[";",",",".","(",")","{","}","[","]"]
-    var delimiters=/^(?:[()\[\]{},:`=;]|\.\.?\.?)/
-    var identifiers=/^[_A-Za-z$][_A-Za-z$0-9]*/
-    var properties=/^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/
-    var regexPrefixes=/^(\/{3}|\/)/
+  var keywords = wordSet(["var","let","class","deinit","enum","extension","func","import","init","protocol",
+                          "static","struct","subscript","typealias","as","dynamicType","is","new","super",
+                          "self","Self","Type","__COLUMN__","__FILE__","__FUNCTION__","__LINE__","break","case",
+                          "continue","default","do","else","fallthrough","if","in","for","return","switch",
+                          "where","while","associativity","didSet","get","infix","inout","left","mutating",
+                          "none","nonmutating","operator","override","postfix","precedence","prefix","right",
+                          "set","unowned","weak","willSet"])
+  var definingKeywords = wordSet(["var","let","class","enum","extension","func","import","protocol","struct",
+                                  "typealias","dynamicType","for"])
+  var atoms = wordSet(["Infinity","NaN","undefined","null","true","false","on","off","yes","no","nil","null",
+                       "this","super"])
+  var types = wordSet(["String","bool","int","string","double","Double","Int","Float","float","public",
+                       "private","extension"])
+  var operators = "+-/*%=|&<>#"
+  var punc = ";,.(){}[]"
+  var number = /^-?(?:(?:[\d_]+\.[_\d]*|\.[_\d]+|0o[0-7_\.]+|0b[01_\.]+)(?:e-?[\d_]+)?|0x[\d_a-f\.]+(?:p-?[\d_]+)?)/i
+  var identifier = /^[_A-Za-z$][_A-Za-z$0-9]*/
+  var property = /^[@\.][_A-Za-z$][_A-Za-z$0-9]*/
+  var regexp = /^\/(?!\s)(?:\/\/)?(?:\\.|[^\/])+\//
+
+  function tokenBase(stream, state, prev) {
+    if (stream.sol()) state.indented = stream.indentation()
+    if (stream.eatSpace()) return null
+
+    var ch = stream.peek()
+    if (ch == "/") {
+      if (stream.match("//")) {
+        stream.skipToEnd()
+        return "comment"
+      }
+      if (stream.match("/*")) {
+        state.tokenize.push(tokenComment)
+        return tokenComment(stream, state)
+      }
+      if (stream.match(regexp)) return "string-2"
+    }
+    if (operators.indexOf(ch) > -1) {
+      stream.next()
+      return "operator"
+    }
+    if (punc.indexOf(ch) > -1) {
+      stream.next()
+      stream.match("..")
+      return "punctuation"
+    }
+    if (ch == '"' || ch == "'") {
+      stream.next()
+      var tokenize = tokenString(ch)
+      state.tokenize.push(tokenize)
+      return tokenize(stream, state)
+    }
+
+    if (stream.match(number)) return "number"
+    if (stream.match(property)) return "property"
+
+    if (stream.match(identifier)) {
+      var ident = stream.current()
+      if (keywords.hasOwnProperty(ident)) {
+        if (definingKeywords.hasOwnProperty(ident))
+          state.prev = "define"
+        return "keyword"
+      }
+      if (types.hasOwnProperty(ident)) return "variable-2"
+      if (atoms.hasOwnProperty(ident)) return "atom"
+      if (prev == "define") return "def"
+      return "variable"
+    }
 
+    stream.next()
+    return null
+  }
+
+  function tokenUntilClosingParen() {
+    var depth = 0
+    return function(stream, state, prev) {
+      var inner = tokenBase(stream, state, prev)
+      if (inner == "punctuation") {
+        if (stream.current() == "(") ++depth
+        else if (stream.current() == ")") {
+          if (depth == 0) {
+            stream.backUp(1)
+            state.tokenize.pop()
+            return state.tokenize[state.tokenize.length - 1](stream, state)
+          }
+          else --depth
+        }
+      }
+      return inner
+    }
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var ch, escaped = false
+      while (ch = stream.next()) {
+        if (escaped) {
+          if (ch == "(") {
+            state.tokenize.push(tokenUntilClosingParen())
+            return "string"
+          }
+          escaped = false
+        } else if (ch == quote) {
+          break
+        } else {
+          escaped = ch == "\\"
+        }
+      }
+      state.tokenize.pop()
+      return "string"
+    }
+  }
+
+  function tokenComment(stream, state) {
+    stream.match(/^(?:[^*]|\*(?!\/))*/)
+    if (stream.match("*/")) state.tokenize.pop()
+    return "comment"
+  }
+
+  function Context(prev, align, indented) {
+    this.prev = prev
+    this.align = align
+    this.indented = indented
+  }
+
+  function pushContext(state, stream) {
+    var align = stream.match(/^\s*($|\/[\/\*])/, false) ? null : stream.column() + 1
+    state.context = new Context(state.context, align, state.indented)
+  }
+
+  function popContext(state) {
+    if (state.context) {
+      state.indented = state.context.indented
+      state.context = state.context.prev
+    }
+  }
+
+  CodeMirror.defineMode("swift", function(config) {
     return {
       startState: function() {
         return {
-          prev: false,
-          string: false,
-          escape: false,
-          inner: false,
-          comment: false,
-          num_left: 0,
-          num_right: 0,
-          doubleString: false,
-          singleString: false
+          prev: null,
+          context: null,
+          indented: 0,
+          tokenize: []
         }
       },
-      token: function(stream, state) {
-        if (stream.eatSpace()) return null
 
-        var ch = stream.next()
-        if (state.string) {
-          if (state.escape) {
-            state.escape = false
-            return "string"
-          } else {
-            if ((ch == "\"" && (state.doubleString && !state.singleString) ||
-                 (ch == "'" && (!state.doubleString && state.singleString))) &&
-                !state.escape) {
-              state.string = false
-              state.doubleString = false
-              state.singleString = false
-              return "string"
-            } else if (ch == "\\" && stream.peek() == "(") {
-              state.inner = true
-              state.string = false
-              return "keyword"
-            } else if (ch == "\\" && stream.peek() != "(") {
-              state.escape = true
-              state.string = true
-              return "string"
-            } else {
-              return "string"
-            }
-          }
-        } else if (state.comment) {
-          if (ch == "*" && stream.peek() == "/") {
-            state.prev = "*"
-            return "comment"
-          } else if (ch == "/" && state.prev == "*") {
-            state.prev = false
-            state.comment = false
-            return "comment"
-          }
-          return "comment"
-        } else {
-          if (ch == "/") {
-            if (stream.peek() == "/") {
-              stream.skipToEnd()
-              return "comment"
-            }
-            if (stream.peek() == "*") {
-              state.comment = true
-              return "comment"
-            }
-          }
-          if (ch == "(" && state.inner) {
-            state.num_left++
-            return null
-          }
-          if (ch == ")" && state.inner) {
-            state.num_right++
-            if (state.num_left == state.num_right) {
-              state.inner=false
-              state.string=true
-            }
-            return null
-          }
+      token: function(stream, state) {
+        var prev = state.prev
+        state.prev = null
+        var tokenize = state.tokenize[state.tokenize.length - 1] || tokenBase
+        var style = tokenize(stream, state, prev)
+        if (!style || style == "comment") state.prev = prev
+        else if (!state.prev) state.prev = style
 
-          var ret = getWord(stream.string, stream.pos)
-          var the_word = ret[1]
-          var prev_word = ret[0]
+        if (style == "punctuation") {
+          var bracket = /[\(\[\{]|([\]\)\}])/.exec(stream.current())
+          if (bracket) (bracket[1] ? popContext : pushContext)(state, stream)
+        }
 
-          if (operators.indexOf(ch + "") > -1) return "operator"
-          if (punc.indexOf(ch) > -1) return "punctuation"
-
-          if (typeof the_word != "undefined") {
-            the_word = trim(the_word)
-            if (typeof prev_word != "undefined") prev_word = trim(prev_word)
-            if (the_word.charAt(0) == "#") return null
-
-            if (types.indexOf(the_word) > -1) return "def"
-            if (commonConstants.indexOf(the_word) > -1) return "atom"
-            if (numbers.indexOf(the_word) > -1) return "number"
-
-            if ((numbers.indexOf(the_word.charAt(0) + "") > -1 ||
-                 operators.indexOf(the_word.charAt(0) + "") > -1) &&
-                numbers.indexOf(ch) > -1) {
-              return "number"
-            }
+        return style
+      },
 
-            if (keywords.indexOf(the_word) > -1 ||
-                keywords.indexOf(the_word.split(tokens)[0]) > -1)
-              return "keyword"
-            if (keywords.indexOf(prev_word) > -1) return "def"
-          }
-          if (ch == '"' && !state.doubleString) {
-            state.string = true
-            state.doubleString = true
-            return "string"
-          }
-          if (ch == "'" && !state.singleString) {
-            state.string = true
-            state.singleString = true
-            return "string"
-          }
-          if (ch == "(" && state.inner)
-            state.num_left++
-          if (ch == ")" && state.inner) {
-            state.num_right++
-            if (state.num_left == state.num_right) {
-              state.inner = false
-              state.string = true
-            }
-            return null
-          }
-          if (stream.match(/^-?[0-9\.]/, false)) {
-            if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i) ||
-                stream.match(/^-?\d+\.\d*/) ||
-                stream.match(/^-?\.\d+/)) {
-              if (stream.peek() == ".") stream.backUp(1)
-              return "number"
-            }
-            if (stream.match(/^-?0x[0-9a-f]+/i) ||
-                stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/) ||
-                stream.match(/^-?0(?![\dx])/i))
-              return "number"
-          }
-          if (stream.match(regexPrefixes)) {
-            if (stream.current()!="/" || stream.match(/^.*\//,false)) return "string"
-            else stream.backUp(1)
-          }
-          if (stream.match(delimiters)) return "punctuation"
-          if (stream.match(identifiers)) return "variable"
-          if (stream.match(properties)) return "property"
-          return "variable"
-        }
-      }
+      indent: function(state, textAfter) {
+        var cx = state.context
+        if (!cx) return 0
+        var closing = /^[\]\}\)]/.test(textAfter)
+        if (cx.align != null) return cx.align - (closing ? 1 : 0)
+        return cx.indented + (closing ? 0 : config.indentUnit)
+      },
+
+      electricInput: /^\s*[\)\}\]]$/,
+
+      lineComment: "//",
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/"
     }
   })
 

rhodecode/public/js/mode/xml/xml.js

@@ -11,54 +11,56 b''
 })(function(CodeMirror) {
 "use strict";
 
-CodeMirror.defineMode("xml", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-  var multilineTagIndentFactor = parserConfig.multilineTagIndentFactor || 1;
-  var multilineTagIndentPastTag = parserConfig.multilineTagIndentPastTag;
-  if (multilineTagIndentPastTag == null) multilineTagIndentPastTag = true;
+var htmlConfig = {
+  autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
+                    'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
+                    'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
+                    'track': true, 'wbr': true, 'menuitem': true},
+  implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
+                     'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
+                     'th': true, 'tr': true},
+  contextGrabbers: {
+    'dd': {'dd': true, 'dt': true},
+    'dt': {'dd': true, 'dt': true},
+    'li': {'li': true},
+    'option': {'option': true, 'optgroup': true},
+    'optgroup': {'optgroup': true},
+    'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
+          'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
+          'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
+          'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
+          'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
+    'rp': {'rp': true, 'rt': true},
+    'rt': {'rp': true, 'rt': true},
+    'tbody': {'tbody': true, 'tfoot': true},
+    'td': {'td': true, 'th': true},
+    'tfoot': {'tbody': true},
+    'th': {'td': true, 'th': true},
+    'thead': {'tbody': true, 'tfoot': true},
+    'tr': {'tr': true}
+  },
+  doNotIndent: {"pre": true},
+  allowUnquoted: true,
+  allowMissing: true,
+  caseFold: true
+}
 
-  var Kludges = parserConfig.htmlMode ? {
-    autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
-                      'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
-                      'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
-                      'track': true, 'wbr': true, 'menuitem': true},
-    implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
-                       'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
-                       'th': true, 'tr': true},
-    contextGrabbers: {
-      'dd': {'dd': true, 'dt': true},
-      'dt': {'dd': true, 'dt': true},
-      'li': {'li': true},
-      'option': {'option': true, 'optgroup': true},
-      'optgroup': {'optgroup': true},
-      'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
-            'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
-            'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
-            'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
-            'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
-      'rp': {'rp': true, 'rt': true},
-      'rt': {'rp': true, 'rt': true},
-      'tbody': {'tbody': true, 'tfoot': true},
-      'td': {'td': true, 'th': true},
-      'tfoot': {'tbody': true},
-      'th': {'td': true, 'th': true},
-      'thead': {'tbody': true, 'tfoot': true},
-      'tr': {'tr': true}
-    },
-    doNotIndent: {"pre": true},
-    allowUnquoted: true,
-    allowMissing: true,
-    caseFold: true
-  } : {
-    autoSelfClosers: {},
-    implicitlyClosed: {},
-    contextGrabbers: {},
-    doNotIndent: {},
-    allowUnquoted: false,
-    allowMissing: false,
-    caseFold: false
-  };
-  var alignCDATA = parserConfig.alignCDATA;
+var xmlConfig = {
+  autoSelfClosers: {},
+  implicitlyClosed: {},
+  contextGrabbers: {},
+  doNotIndent: {},
+  allowUnquoted: false,
+  allowMissing: false,
+  caseFold: false
+}
+
+CodeMirror.defineMode("xml", function(editorConf, config_) {
+  var indentUnit = editorConf.indentUnit
+  var config = {}
+  var defaults = config_.htmlMode ? htmlConfig : xmlConfig
+  for (var prop in defaults) config[prop] = defaults[prop]
+  for (var prop in config_) config[prop] = config_[prop]
 
   // Return variables for tokenizers
   var type, setStyle;
@@ -109,6 +111,7 b' CodeMirror.defineMode("xml", function(co'
       return null;
     }
   }
+  inText.isInText = true;
 
   function inTag(stream, state) {
     var ch = stream.next();
@@ -187,7 +190,7 b' CodeMirror.defineMode("xml", function(co'
     this.tagName = tagName;
     this.indent = state.indented;
     this.startOfLine = startOfLine;
-    if (Kludges.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
+    if (config.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
       this.noIndent = true;
   }
   function popContext(state) {
@@ -200,8 +203,8 b' CodeMirror.defineMode("xml", function(co'
         return;
       }
       parentTagName = state.context.tagName;
-      if (!Kludges.contextGrabbers.hasOwnProperty(parentTagName) ||
-          !Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
+      if (!config.contextGrabbers.hasOwnProperty(parentTagName) ||
+          !config.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
         return;
       }
       popContext(state);
@@ -232,7 +235,7 b' CodeMirror.defineMode("xml", function(co'
     if (type == "word") {
       var tagName = stream.current();
       if (state.context && state.context.tagName != tagName &&
-          Kludges.implicitlyClosed.hasOwnProperty(state.context.tagName))
+          config.implicitlyClosed.hasOwnProperty(state.context.tagName))
         popContext(state);
       if (state.context && state.context.tagName == tagName) {
         setStyle = "tag";
@@ -268,7 +271,7 b' CodeMirror.defineMode("xml", function(co'
       var tagName = state.tagName, tagStart = state.tagStart;
       state.tagName = state.tagStart = null;
       if (type == "selfcloseTag" ||
-          Kludges.autoSelfClosers.hasOwnProperty(tagName)) {
+          config.autoSelfClosers.hasOwnProperty(tagName)) {
         maybePopContext(state, tagName);
       } else {
         maybePopContext(state, tagName);
@@ -281,12 +284,12 b' CodeMirror.defineMode("xml", function(co'
   }
   function attrEqState(type, stream, state) {
     if (type == "equals") return attrValueState;
-    if (!Kludges.allowMissing) setStyle = "error";
+    if (!config.allowMissing) setStyle = "error";
     return attrState(type, stream, state);
   }
   function attrValueState(type, stream, state) {
     if (type == "string") return attrContinuedState;
-    if (type == "word" && Kludges.allowUnquoted) {setStyle = "string"; return attrState;}
+    if (type == "word" && config.allowUnquoted) {setStyle = "string"; return attrState;}
     setStyle = "error";
     return attrState(type, stream, state);
   }
@@ -296,12 +299,14 b' CodeMirror.defineMode("xml", function(co'
   }
 
   return {
-    startState: function() {
-      return {tokenize: inText,
-              state: baseState,
-              indented: 0,
-              tagName: null, tagStart: null,
-              context: null};
+    startState: function(baseIndent) {
+      var state = {tokenize: inText,
+                   state: baseState,
+                   indented: baseIndent || 0,
+                   tagName: null, tagStart: null,
+                   context: null}
+      if (baseIndent != null) state.baseIndent = baseIndent
+      return state
     },
 
     token: function(stream, state) {
@@ -334,19 +339,19 b' CodeMirror.defineMode("xml", function(co'
         return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0;
       // Indent the starts of attribute names.
       if (state.tagName) {
-        if (multilineTagIndentPastTag)
+        if (config.multilineTagIndentPastTag !== false)
           return state.tagStart + state.tagName.length + 2;
         else
-          return state.tagStart + indentUnit * multilineTagIndentFactor;
+          return state.tagStart + indentUnit * (config.multilineTagIndentFactor || 1);
       }
-      if (alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
+      if (config.alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
       var tagAfter = textAfter && /^<(\/)?([\w_:\.-]*)/.exec(textAfter);
       if (tagAfter && tagAfter[1]) { // Closing tag spotted
         while (context) {
           if (context.tagName == tagAfter[2]) {
             context = context.prev;
             break;
-          } else if (Kludges.implicitlyClosed.hasOwnProperty(context.tagName)) {
+          } else if (config.implicitlyClosed.hasOwnProperty(context.tagName)) {
             context = context.prev;
           } else {
             break;
@@ -354,25 +359,30 b' CodeMirror.defineMode("xml", function(co'
         }
       } else if (tagAfter) { // Opening tag spotted
         while (context) {
-          var grabbers = Kludges.contextGrabbers[context.tagName];
+          var grabbers = config.contextGrabbers[context.tagName];
           if (grabbers && grabbers.hasOwnProperty(tagAfter[2]))
             context = context.prev;
           else
             break;
         }
       }
-      while (context && !context.startOfLine)
+      while (context && context.prev && !context.startOfLine)
         context = context.prev;
       if (context) return context.indent + indentUnit;
-      else return 0;
+      else return state.baseIndent || 0;
     },
 
     electricInput: /<\/[\s\w:]+>$/,
     blockCommentStart: "<!--",
     blockCommentEnd: "-->",
 
-    configuration: parserConfig.htmlMode ? "html" : "xml",
-    helperType: parserConfig.htmlMode ? "html" : "xml"
+    configuration: config.htmlMode ? "html" : "xml",
+    helperType: config.htmlMode ? "html" : "xml",
+
+    skipAttribute: function(state) {
+      if (state.state == attrValueState)
+        state.state = attrState
+    }
   };
 });
 

rhodecode/public/js/rhodecode/i18n/be.js

@@ -5,35 +5,71 b''
  */
 //JS translations map
 var _TM = {
-    '{0} active out of {1} users': '{0} active out of {1} users',
-    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     'Add another comment': 'Add another comment',
-    'disabled': 'disabled',
-    'enabled': 'enabled',
+    'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Follow': 'Follow',
-    'loading ...': 'loading ...',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
+    'No bookmarks available yet.': 'No bookmarks available yet.',
+    'No branches available yet.': 'No branches available yet.',
+    'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
+    'No pull requests available yet.': 'No pull requests available yet.',
+    'No repositories available yet.': 'No repositories available yet.',
+    'No repository groups available yet.': 'No repository groups available yet.',
     'No results': 'No results',
+    'No tags available yet.': 'No tags available yet.',
+    'No user groups available yet.': 'No user groups available yet.',
+    'No users available yet.': 'No users available yet.',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
+    'Please delete {0} character': 'Please delete {0} character',
+    'Please delete {0} characters': 'Please delete {0} characters',
+    'Please enter {0} or more character': 'Please enter {0} or more character',
+    'Please enter {0} or more characters': 'Please enter {0} or more characters',
     'Searching...': 'Searching...',
-    'Select changeset': 'Select changeset',
-    'Select commit': 'Select commit',
     'Selection link': 'Selection link',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Start following this repository': 'Start following this repository',
+    'Status Review': 'Status Review',
+    'Stop following this repository': 'Stop following this repository',
+    'Submitting...': 'Submitting...',
+    'Unfollow': 'Unfollow',
+    'Updating...': 'Updating...',
+    'You can only select {0} item': 'You can only select {0} item',
+    'You can only select {0} items': 'You can only select {0} items',
+    'disabled': 'disabled',
+    'enabled': 'enabled',
+    'file': 'file',
+    'files': 'files',
+    'in {0}': 'in {0}',
+    'in {0} and {1}': 'in {0} and {1}',
+    'in {0}, {1}': 'in {0}, {1}',
+    'just now': 'just now',
     'specify commit': 'specify commit',
-    'Start following this repository': 'Start following this repository',
-    'Stop following this repository': 'Stop following this repository',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
-    'Unfollow': 'Unfollow',
-    'Updating...': 'Updating...'
+    '{0} active out of {1} users': '{0} active out of {1} users',
+    '{0} ago': '{0} ago',
+    '{0} and {1}': '{0} and {1}',
+    '{0} and {1} ago': '{0} and {1} ago',
+    '{0} day': '{0} day',
+    '{0} days': '{0} days',
+    '{0} hour': '{0} hour',
+    '{0} hours': '{0} hours',
+    '{0} min': '{0} min',
+    '{0} month': '{0} month',
+    '{0} months': '{0} months',
+    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
+    '{0} sec': '{0} sec',
+    '{0} year': '{0} year',
+    '{0} years': '{0} years',
+    '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/de.js

@@ -5,35 +5,71 b''
  */
 //JS translations map
 var _TM = {
-    '{0} active out of {1} users': '{0} active out of {1} users',
-    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     'Add another comment': 'Add another comment',
-    'disabled': 'disabled',
-    'enabled': 'enabled',
+    'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Follow': 'Follow',
-    'loading ...': 'loading ...',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
+    'No bookmarks available yet.': 'No bookmarks available yet.',
+    'No branches available yet.': 'No branches available yet.',
+    'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
+    'No pull requests available yet.': 'No pull requests available yet.',
+    'No repositories available yet.': 'No repositories available yet.',
+    'No repository groups available yet.': 'No repository groups available yet.',
     'No results': 'No results',
+    'No tags available yet.': 'No tags available yet.',
+    'No user groups available yet.': 'No user groups available yet.',
+    'No users available yet.': 'No users available yet.',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
+    'Please delete {0} character': 'Please delete {0} character',
+    'Please delete {0} characters': 'Please delete {0} characters',
+    'Please enter {0} or more character': 'Please enter {0} or more character',
+    'Please enter {0} or more characters': 'Please enter {0} or more characters',
     'Searching...': 'Searching...',
-    'Select changeset': 'Select changeset',
-    'Select commit': 'Select commit',
     'Selection link': 'Selection link',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Start following this repository': 'Start following this repository',
+    'Status Review': 'Status Review',
+    'Stop following this repository': 'Stop following this repository',
+    'Submitting...': 'Submitting...',
+    'Unfollow': 'Unfollow',
+    'Updating...': 'Updating...',
+    'You can only select {0} item': 'You can only select {0} item',
+    'You can only select {0} items': 'You can only select {0} items',
+    'disabled': 'disabled',
+    'enabled': 'enabled',
+    'file': 'file',
+    'files': 'files',
+    'in {0}': 'in {0}',
+    'in {0} and {1}': 'in {0} and {1}',
+    'in {0}, {1}': 'in {0}, {1}',
+    'just now': 'jetzt gerade',
     'specify commit': 'specify commit',
-    'Start following this repository': 'Start following this repository',
-    'Stop following this repository': 'Stop following this repository',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
-    'Unfollow': 'Unfollow',
-    'Updating...': 'Updating...'
+    '{0} active out of {1} users': '{0} active out of {1} users',
+    '{0} ago': '{0} ago',
+    '{0} and {1}': '{0} and {1}',
+    '{0} and {1} ago': '{0} and {1} ago',
+    '{0} day': '{0} day',
+    '{0} days': '{0} days',
+    '{0} hour': '{0} hour',
+    '{0} hours': '{0} hours',
+    '{0} min': '{0} min',
+    '{0} month': '{0} month',
+    '{0} months': '{0} months',
+    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
+    '{0} sec': '{0} sec',
+    '{0} year': '{0} year',
+    '{0} years': '{0} years',
+    '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/en.js

@@ -5,35 +5,71 b''
  */
 //JS translations map
 var _TM = {
-    '{0} active out of {1} users': '{0} active out of {1} users',
-    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     'Add another comment': 'Add another comment',
-    'disabled': 'disabled',
-    'enabled': 'enabled',
+    'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Follow': 'Follow',
-    'loading ...': 'loading ...',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
+    'No bookmarks available yet.': 'No bookmarks available yet.',
+    'No branches available yet.': 'No branches available yet.',
+    'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
+    'No pull requests available yet.': 'No pull requests available yet.',
+    'No repositories available yet.': 'No repositories available yet.',
+    'No repository groups available yet.': 'No repository groups available yet.',
     'No results': 'No results',
+    'No tags available yet.': 'No tags available yet.',
+    'No user groups available yet.': 'No user groups available yet.',
+    'No users available yet.': 'No users available yet.',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
+    'Please delete {0} character': 'Please delete {0} character',
+    'Please delete {0} characters': 'Please delete {0} characters',
+    'Please enter {0} or more character': 'Please enter {0} or more character',
+    'Please enter {0} or more characters': 'Please enter {0} or more characters',
     'Searching...': 'Searching...',
-    'Select changeset': 'Select changeset',
-    'Select commit': 'Select commit',
     'Selection link': 'Selection link',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Start following this repository': 'Start following this repository',
+    'Status Review': 'Status Review',
+    'Stop following this repository': 'Stop following this repository',
+    'Submitting...': 'Submitting...',
+    'Unfollow': 'Unfollow',
+    'Updating...': 'Updating...',
+    'You can only select {0} item': 'You can only select {0} item',
+    'You can only select {0} items': 'You can only select {0} items',
+    'disabled': 'disabled',
+    'enabled': 'enabled',
+    'file': 'file',
+    'files': 'files',
+    'in {0}': 'in {0}',
+    'in {0} and {1}': 'in {0} and {1}',
+    'in {0}, {1}': 'in {0}, {1}',
+    'just now': 'just now',
     'specify commit': 'specify commit',
-    'Start following this repository': 'Start following this repository',
-    'Stop following this repository': 'Stop following this repository',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
-    'Unfollow': 'Unfollow',
-    'Updating...': 'Updating...'
+    '{0} active out of {1} users': '{0} active out of {1} users',
+    '{0} ago': '{0} ago',
+    '{0} and {1}': '{0} and {1}',
+    '{0} and {1} ago': '{0} and {1} ago',
+    '{0} day': '{0} day',
+    '{0} days': '{0} days',
+    '{0} hour': '{0} hour',
+    '{0} hours': '{0} hours',
+    '{0} min': '{0} min',
+    '{0} month': '{0} month',
+    '{0} months': '{0} months',
+    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
+    '{0} sec': '{0} sec',
+    '{0} year': '{0} year',
+    '{0} years': '{0} years',
+    '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/es.js

@@ -5,35 +5,71 b''
  */
 //JS translations map
 var _TM = {
-    '{0} active out of {1} users': '{0} active out of {1} users',
-    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     'Add another comment': 'Add another comment',
-    'disabled': 'disabled',
-    'enabled': 'enabled',
+    'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Follow': 'Follow',
-    'loading ...': 'loading ...',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
+    'No bookmarks available yet.': 'No bookmarks available yet.',
+    'No branches available yet.': 'No branches available yet.',
+    'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
+    'No pull requests available yet.': 'No pull requests available yet.',
+    'No repositories available yet.': 'No repositories available yet.',
+    'No repository groups available yet.': 'No repository groups available yet.',
     'No results': 'No results',
+    'No tags available yet.': 'No tags available yet.',
+    'No user groups available yet.': 'No user groups available yet.',
+    'No users available yet.': 'No users available yet.',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
+    'Please delete {0} character': 'Please delete {0} character',
+    'Please delete {0} characters': 'Please delete {0} characters',
+    'Please enter {0} or more character': 'Please enter {0} or more character',
+    'Please enter {0} or more characters': 'Please enter {0} or more characters',
     'Searching...': 'Searching...',
-    'Select changeset': 'Select changeset',
-    'Select commit': 'Select commit',
     'Selection link': 'Selection link',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Start following this repository': 'Start following this repository',
+    'Status Review': 'Status Review',
+    'Stop following this repository': 'Stop following this repository',
+    'Submitting...': 'Submitting...',
+    'Unfollow': 'Unfollow',
+    'Updating...': 'Updating...',
+    'You can only select {0} item': 'You can only select {0} item',
+    'You can only select {0} items': 'You can only select {0} items',
+    'disabled': 'disabled',
+    'enabled': 'enabled',
+    'file': 'file',
+    'files': 'files',
+    'in {0}': 'in {0}',
+    'in {0} and {1}': 'in {0} and {1}',
+    'in {0}, {1}': 'in {0}, {1}',
+    'just now': 'just now',
     'specify commit': 'specify commit',
-    'Start following this repository': 'Start following this repository',
-    'Stop following this repository': 'Stop following this repository',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
-    'Unfollow': 'Unfollow',
-    'Updating...': 'Updating...'
+    '{0} active out of {1} users': '{0} active out of {1} users',
+    '{0} ago': '{0} ago',
+    '{0} and {1}': '{0} and {1}',
+    '{0} and {1} ago': '{0} and {1} ago',
+    '{0} day': '{0} day',
+    '{0} days': '{0} days',
+    '{0} hour': '{0} hour',
+    '{0} hours': '{0} hours',
+    '{0} min': '{0} min',
+    '{0} month': '{0} month',
+    '{0} months': '{0} months',
+    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
+    '{0} sec': '{0} sec',
+    '{0} year': '{0} year',
+    '{0} years': '{0} years',
+    '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/fr.js

@@ -5,35 +5,71 b''
  */
 //JS translations map
 var _TM = {
-    '{0} active out of {1} users': '{0} active out of {1} users',
-    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     'Add another comment': 'Add another comment',
-    'disabled': 'Désactivé',
-    'enabled': 'enabled',
+    'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Follow': 'Follow',
-    'loading ...': 'loading ...',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
+    'No bookmarks available yet.': 'No bookmarks available yet.',
+    'No branches available yet.': 'No branches available yet.',
+    'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
+    'No pull requests available yet.': 'No pull requests available yet.',
+    'No repositories available yet.': 'No repositories available yet.',
+    'No repository groups available yet.': 'No repository groups available yet.',
     'No results': 'No results',
+    'No tags available yet.': 'No tags available yet.',
+    'No user groups available yet.': 'No user groups available yet.',
+    'No users available yet.': 'No users available yet.',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Nouvelle requête de pull',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
+    'Please delete {0} character': 'Please delete {0} character',
+    'Please delete {0} characters': 'Please delete {0} characters',
+    'Please enter {0} or more character': 'Please enter {0} or more character',
+    'Please enter {0} or more characters': 'Please enter {0} or more characters',
     'Searching...': 'Searching...',
-    'Select changeset': 'Select changeset',
-    'Select commit': 'Select commit',
     'Selection link': 'Selection link',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Start following this repository': 'Start following this repository',
+    'Status Review': 'Status Review',
+    'Stop following this repository': 'Stop following this repository',
+    'Submitting...': 'Submitting...',
+    'Unfollow': 'Unfollow',
+    'Updating...': 'Updating...',
+    'You can only select {0} item': 'You can only select {0} item',
+    'You can only select {0} items': 'You can only select {0} items',
+    'disabled': 'Désactivé',
+    'enabled': 'enabled',
+    'file': 'file',
+    'files': 'files',
+    'in {0}': 'in {0}',
+    'in {0} and {1}': 'in {0} and {1}',
+    'in {0}, {1}': 'in {0}, {1}',
+    'just now': 'à l’instant',
     'specify commit': 'specify commit',
-    'Start following this repository': 'Start following this repository',
-    'Stop following this repository': 'Stop following this repository',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
-    'Unfollow': 'Unfollow',
-    'Updating...': 'Updating...'
+    '{0} active out of {1} users': '{0} active out of {1} users',
+    '{0} ago': '{0} ago',
+    '{0} and {1}': '{0} and {1}',
+    '{0} and {1} ago': '{0} and {1} ago',
+    '{0} day': '{0} day',
+    '{0} days': '{0} days',
+    '{0} hour': '{0} hour',
+    '{0} hours': '{0} hours',
+    '{0} min': '{0} min',
+    '{0} month': '{0} month',
+    '{0} months': '{0} months',
+    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
+    '{0} sec': '{0} sec',
+    '{0} year': '{0} year',
+    '{0} years': '{0} years',
+    '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/it.js

@@ -5,35 +5,71 b''
  */
 //JS translations map
 var _TM = {
-    '{0} active out of {1} users': '{0} active out of {1} users',
-    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     'Add another comment': 'Add another comment',
-    'disabled': 'disabilitato',
-    'enabled': 'abilitato',
+    'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Follow': 'Follow',
-    'loading ...': 'loading ...',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
+    'No bookmarks available yet.': 'No bookmarks available yet.',
+    'No branches available yet.': 'No branches available yet.',
+    'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
+    'No pull requests available yet.': 'No pull requests available yet.',
+    'No repositories available yet.': 'No repositories available yet.',
+    'No repository groups available yet.': 'No repository groups available yet.',
     'No results': 'No results',
+    'No tags available yet.': 'No tags available yet.',
+    'No user groups available yet.': 'No user groups available yet.',
+    'No users available yet.': 'No users available yet.',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Apri una richiesta PULL',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
+    'Please delete {0} character': 'Please delete {0} character',
+    'Please delete {0} characters': 'Please delete {0} characters',
+    'Please enter {0} or more character': 'Please enter {0} or more character',
+    'Please enter {0} or more characters': 'Please enter {0} or more characters',
     'Searching...': 'Searching...',
-    'Select changeset': 'Select changeset',
-    'Select commit': 'Seleziona una commit',
     'Selection link': 'Selection link',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Start following this repository': 'Start following this repository',
+    'Status Review': 'Status Review',
+    'Stop following this repository': 'Stop following this repository',
+    'Submitting...': 'Submitting...',
+    'Unfollow': 'Unfollow',
+    'Updating...': 'Updating...',
+    'You can only select {0} item': 'You can only select {0} item',
+    'You can only select {0} items': 'You can only select {0} items',
+    'disabled': 'disabilitato',
+    'enabled': 'abilitato',
+    'file': 'file',
+    'files': 'files',
+    'in {0}': 'in {0}',
+    'in {0} and {1}': 'in {0} and {1}',
+    'in {0}, {1}': 'in {0}, {1}',
+    'just now': 'proprio ora',
     'specify commit': 'specify commit',
-    'Start following this repository': 'Start following this repository',
-    'Stop following this repository': 'Stop following this repository',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
-    'Unfollow': 'Unfollow',
-    'Updating...': 'Updating...'
+    '{0} active out of {1} users': '{0} active out of {1} users',
+    '{0} ago': '{0} ago',
+    '{0} and {1}': '{0} and {1}',
+    '{0} and {1} ago': '{0} and {1} ago',
+    '{0} day': '{0} day',
+    '{0} days': '{0} days',
+    '{0} hour': '{0} hour',
+    '{0} hours': '{0} hours',
+    '{0} min': '{0} min',
+    '{0} month': '{0} month',
+    '{0} months': '{0} months',
+    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
+    '{0} sec': '{0} sec',
+    '{0} year': '{0} year',
+    '{0} years': '{0} years',
+    '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/ja.js

@@ -5,35 +5,71 b''
  */
 //JS translations map
 var _TM = {
-    '{0} active out of {1} users': '{0} active out of {1} users',
-    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     'Add another comment': 'Add another comment',
-    'disabled': '無効',
-    'enabled': '有効',
+    'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Follow': 'Follow',
-    'loading ...': 'loading ...',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
+    'No bookmarks available yet.': 'No bookmarks available yet.',
+    'No branches available yet.': 'No branches available yet.',
+    'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
+    'No pull requests available yet.': 'No pull requests available yet.',
+    'No repositories available yet.': 'No repositories available yet.',
+    'No repository groups available yet.': 'No repository groups available yet.',
     'No results': 'No results',
+    'No tags available yet.': 'No tags available yet.',
+    'No user groups available yet.': 'No user groups available yet.',
+    'No users available yet.': 'No users available yet.',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': '新しいプルリクエストを作成',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
+    'Please delete {0} character': 'Please delete {0} character',
+    'Please delete {0} characters': 'Please delete {0} characters',
+    'Please enter {0} or more character': 'Please enter {0} or more character',
+    'Please enter {0} or more characters': 'Please enter {0} or more characters',
     'Searching...': 'Searching...',
-    'Select changeset': 'Select changeset',
-    'Select commit': 'Select commit',
     'Selection link': 'Selection link',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Start following this repository': 'Start following this repository',
+    'Status Review': 'Status Review',
+    'Stop following this repository': 'Stop following this repository',
+    'Submitting...': 'Submitting...',
+    'Unfollow': 'Unfollow',
+    'Updating...': 'Updating...',
+    'You can only select {0} item': 'You can only select {0} item',
+    'You can only select {0} items': 'You can only select {0} items',
+    'disabled': '無効',
+    'enabled': '有効',
+    'file': 'file',
+    'files': 'files',
+    'in {0}': 'in {0}',
+    'in {0} and {1}': 'in {0} and {1}',
+    'in {0}, {1}': 'in {0}, {1}',
+    'just now': 'たったいま',
     'specify commit': 'specify commit',
-    'Start following this repository': 'Start following this repository',
-    'Stop following this repository': 'Stop following this repository',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
-    'Unfollow': 'Unfollow',
-    'Updating...': 'Updating...'
+    '{0} active out of {1} users': '{0} active out of {1} users',
+    '{0} ago': '{0} ago',
+    '{0} and {1}': '{0} and {1}',
+    '{0} and {1} ago': '{0} and {1} ago',
+    '{0} day': '{0} day',
+    '{0} days': '{0} days',
+    '{0} hour': '{0} hour',
+    '{0} hours': '{0} hours',
+    '{0} min': '{0} min',
+    '{0} month': '{0} month',
+    '{0} months': '{0} months',
+    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
+    '{0} sec': '{0} sec',
+    '{0} year': '{0} year',
+    '{0} years': '{0} years',
+    '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/pl.js

@@ -5,35 +5,71 b''
  */
 //JS translations map
 var _TM = {
-    '{0} active out of {1} users': '{0} active out of {1} users',
-    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     'Add another comment': 'Add another comment',
-    'disabled': 'disabled',
-    'enabled': 'enabled',
+    'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Follow': 'Follow',
-    'loading ...': 'loading ...',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
+    'No bookmarks available yet.': 'No bookmarks available yet.',
+    'No branches available yet.': 'No branches available yet.',
+    'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
+    'No pull requests available yet.': 'No pull requests available yet.',
+    'No repositories available yet.': 'No repositories available yet.',
+    'No repository groups available yet.': 'No repository groups available yet.',
     'No results': 'No results',
+    'No tags available yet.': 'No tags available yet.',
+    'No user groups available yet.': 'No user groups available yet.',
+    'No users available yet.': 'No users available yet.',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Otwórz nową prośbę o połączenie gałęzi',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
+    'Please delete {0} character': 'Please delete {0} character',
+    'Please delete {0} characters': 'Please delete {0} characters',
+    'Please enter {0} or more character': 'Please enter {0} or more character',
+    'Please enter {0} or more characters': 'Please enter {0} or more characters',
     'Searching...': 'Searching...',
-    'Select changeset': 'Select changeset',
-    'Select commit': 'Select commit',
     'Selection link': 'Selection link',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Start following this repository': 'Start following this repository',
+    'Status Review': 'Status Review',
+    'Stop following this repository': 'Stop following this repository',
+    'Submitting...': 'Submitting...',
+    'Unfollow': 'Unfollow',
+    'Updating...': 'Updating...',
+    'You can only select {0} item': 'You can only select {0} item',
+    'You can only select {0} items': 'You can only select {0} items',
+    'disabled': 'disabled',
+    'enabled': 'enabled',
+    'file': 'file',
+    'files': 'files',
+    'in {0}': 'in {0}',
+    'in {0} and {1}': 'in {0} and {1}',
+    'in {0}, {1}': 'in {0}, {1}',
+    'just now': 'przed chwilą',
     'specify commit': 'specify commit',
-    'Start following this repository': 'Start following this repository',
-    'Stop following this repository': 'Stop following this repository',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
-    'Unfollow': 'Unfollow',
-    'Updating...': 'Updating...'
+    '{0} active out of {1} users': '{0} active out of {1} users',
+    '{0} ago': '{0} ago',
+    '{0} and {1}': '{0} and {1}',
+    '{0} and {1} ago': '{0} and {1} ago',
+    '{0} day': '{0} day',
+    '{0} days': '{0} days',
+    '{0} hour': '{0} hour',
+    '{0} hours': '{0} hours',
+    '{0} min': '{0} min',
+    '{0} month': '{0} month',
+    '{0} months': '{0} months',
+    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
+    '{0} sec': '{0} sec',
+    '{0} year': '{0} year',
+    '{0} years': '{0} years',
+    '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/pt.js

@@ -5,35 +5,71 b''
  */
 //JS translations map
 var _TM = {
-    '{0} active out of {1} users': '{0} active out of {1} users',
-    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     'Add another comment': 'Add another comment',
-    'disabled': 'desabilitado',
-    'enabled': 'enabled',
+    'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Follow': 'Follow',
-    'loading ...': 'loading ...',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
+    'No bookmarks available yet.': 'No bookmarks available yet.',
+    'No branches available yet.': 'No branches available yet.',
+    'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
+    'No pull requests available yet.': 'No pull requests available yet.',
+    'No repositories available yet.': 'No repositories available yet.',
+    'No repository groups available yet.': 'No repository groups available yet.',
     'No results': 'No results',
+    'No tags available yet.': 'No tags available yet.',
+    'No user groups available yet.': 'No user groups available yet.',
+    'No users available yet.': 'No users available yet.',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Crie novo pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
+    'Please delete {0} character': 'Please delete {0} character',
+    'Please delete {0} characters': 'Please delete {0} characters',
+    'Please enter {0} or more character': 'Please enter {0} or more character',
+    'Please enter {0} or more characters': 'Please enter {0} or more characters',
     'Searching...': 'Searching...',
-    'Select changeset': 'Select changeset',
-    'Select commit': 'Select commit',
     'Selection link': 'Selection link',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Start following this repository': 'Start following this repository',
+    'Status Review': 'Status Review',
+    'Stop following this repository': 'Stop following this repository',
+    'Submitting...': 'Submitting...',
+    'Unfollow': 'Unfollow',
+    'Updating...': 'Updating...',
+    'You can only select {0} item': 'You can only select {0} item',
+    'You can only select {0} items': 'You can only select {0} items',
+    'disabled': 'desabilitado',
+    'enabled': 'enabled',
+    'file': 'file',
+    'files': 'files',
+    'in {0}': 'in {0}',
+    'in {0} and {1}': 'in {0} and {1}',
+    'in {0}, {1}': 'in {0}, {1}',
+    'just now': 'agora há pouco',
     'specify commit': 'specify commit',
-    'Start following this repository': 'Start following this repository',
-    'Stop following this repository': 'Stop following this repository',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
-    'Unfollow': 'Unfollow',
-    'Updating...': 'Updating...'
+    '{0} active out of {1} users': '{0} active out of {1} users',
+    '{0} ago': '{0} ago',
+    '{0} and {1}': '{0} and {1}',
+    '{0} and {1} ago': '{0} and {1} ago',
+    '{0} day': '{0} day',
+    '{0} days': '{0} days',
+    '{0} hour': '{0} hour',
+    '{0} hours': '{0} hours',
+    '{0} min': '{0} min',
+    '{0} month': '{0} month',
+    '{0} months': '{0} months',
+    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
+    '{0} sec': '{0} sec',
+    '{0} year': '{0} year',
+    '{0} years': '{0} years',
+    '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/ru.js

@@ -5,35 +5,71 b''
  */
 //JS translations map
 var _TM = {
-    '{0} active out of {1} users': '{0} active out of {1} users',
-    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     'Add another comment': 'Add another comment',
-    'disabled': 'отключено',
-    'enabled': 'enabled',
+    'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Follow': 'Follow',
-    'loading ...': 'loading ...',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
+    'No bookmarks available yet.': 'No bookmarks available yet.',
+    'No branches available yet.': 'No branches available yet.',
+    'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
+    'No pull requests available yet.': 'No pull requests available yet.',
+    'No repositories available yet.': 'No repositories available yet.',
+    'No repository groups available yet.': 'No repository groups available yet.',
     'No results': 'No results',
+    'No tags available yet.': 'No tags available yet.',
+    'No user groups available yet.': 'No user groups available yet.',
+    'No users available yet.': 'No users available yet.',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Создать новый pull запрос',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
+    'Please delete {0} character': 'Please delete {0} character',
+    'Please delete {0} characters': 'Please delete {0} characters',
+    'Please enter {0} or more character': 'Please enter {0} or more character',
+    'Please enter {0} or more characters': 'Please enter {0} or more characters',
     'Searching...': 'Searching...',
-    'Select changeset': 'Select changeset',
-    'Select commit': 'Select commit',
     'Selection link': 'Selection link',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Start following this repository': 'Start following this repository',
+    'Status Review': 'Status Review',
+    'Stop following this repository': 'Stop following this repository',
+    'Submitting...': 'Submitting...',
+    'Unfollow': 'Unfollow',
+    'Updating...': 'Updating...',
+    'You can only select {0} item': 'You can only select {0} item',
+    'You can only select {0} items': 'You can only select {0} items',
+    'disabled': 'отключено',
+    'enabled': 'enabled',
+    'file': 'file',
+    'files': 'files',
+    'in {0}': 'in {0}',
+    'in {0} and {1}': 'in {0} and {1}',
+    'in {0}, {1}': 'in {0}, {1}',
+    'just now': 'прямо сейчас',
     'specify commit': 'specify commit',
-    'Start following this repository': 'Start following this repository',
-    'Stop following this repository': 'Stop following this repository',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
-    'Unfollow': 'Unfollow',
-    'Updating...': 'Updating...'
+    '{0} active out of {1} users': '{0} active out of {1} users',
+    '{0} ago': '{0} ago',
+    '{0} and {1}': '{0} and {1}',
+    '{0} and {1} ago': '{0} and {1} ago',
+    '{0} day': '{0} day',
+    '{0} days': '{0} days',
+    '{0} hour': '{0} hour',
+    '{0} hours': '{0} hours',
+    '{0} min': '{0} min',
+    '{0} month': '{0} month',
+    '{0} months': '{0} months',
+    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
+    '{0} sec': '{0} sec',
+    '{0} year': '{0} year',
+    '{0} years': '{0} years',
+    '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

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

@@ -5,35 +5,71 b''
  */
 //JS translations map
 var _TM = {
-    '{0} active out of {1} users': '{0} active out of {1} users',
-    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     'Add another comment': 'Add another comment',
-    'disabled': '禁用',
-    'enabled': 'enabled',
+    'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
     'Follow': 'Follow',
-    'loading ...': 'loading ...',
     'Loading ...': 'Loading ...',
     'Loading failed': 'Loading failed',
     'Loading more results...': 'Loading more results...',
+    'No bookmarks available yet.': 'No bookmarks available yet.',
+    'No branches available yet.': 'No branches available yet.',
+    'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
+    'No pull requests available yet.': 'No pull requests available yet.',
+    'No repositories available yet.': 'No repositories available yet.',
+    'No repository groups available yet.': 'No repository groups available yet.',
     'No results': 'No results',
+    'No tags available yet.': 'No tags available yet.',
+    'No user groups available yet.': 'No user groups available yet.',
+    'No users available yet.': 'No users available yet.',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': '新建拉取请求',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
+    'Please delete {0} character': 'Please delete {0} character',
+    'Please delete {0} characters': 'Please delete {0} characters',
+    'Please enter {0} or more character': 'Please enter {0} or more character',
+    'Please enter {0} or more characters': 'Please enter {0} or more characters',
     'Searching...': 'Searching...',
-    'Select changeset': 'Select changeset',
-    'Select commit': 'Select commit',
     'Selection link': 'Selection link',
     'Set status to Approved': 'Set status to Approved',
     'Set status to Rejected': 'Set status to Rejected',
+    'Show more': 'Show more',
     'Show selected commit __S': 'Show selected commit __S',
     'Show selected commits __S ... __E': 'Show selected commits __S ... __E',
+    'Start following this repository': 'Start following this repository',
+    'Status Review': 'Status Review',
+    'Stop following this repository': 'Stop following this repository',
+    'Submitting...': 'Submitting...',
+    'Unfollow': 'Unfollow',
+    'Updating...': 'Updating...',
+    'You can only select {0} item': 'You can only select {0} item',
+    'You can only select {0} items': 'You can only select {0} items',
+    'disabled': '禁用',
+    'enabled': 'enabled',
+    'file': 'file',
+    'files': 'files',
+    'in {0}': 'in {0}',
+    'in {0} and {1}': 'in {0} and {1}',
+    'in {0}, {1}': 'in {0}, {1}',
+    'just now': '刚才',
     'specify commit': 'specify commit',
-    'Start following this repository': 'Start following this repository',
-    'Stop following this repository': 'Stop following this repository',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
-    'Unfollow': 'Unfollow',
-    'Updating...': 'Updating...'
+    '{0} active out of {1} users': '{0} active out of {1} users',
+    '{0} ago': '{0} ago',
+    '{0} and {1}': '{0} and {1}',
+    '{0} and {1} ago': '{0} and {1} ago',
+    '{0} day': '{0} day',
+    '{0} days': '{0} days',
+    '{0} hour': '{0} hour',
+    '{0} hours': '{0} hours',
+    '{0} min': '{0} min',
+    '{0} month': '{0} month',
+    '{0} months': '{0} months',
+    '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
+    '{0} sec': '{0} sec',
+    '{0} year': '{0} year',
+    '{0} years': '{0} years',
+    '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/routes.js

@@ -4,7 +4,8 b''
  *                      DO NOT CHANGE THIS FILE MANUALLY                      *
  *                                                                            *
  *                                                                            *
- *        This file is automatically generated when the app starts up.        *
+ *        This file is automatically generated when the app starts up with    *
+ *                         generate_js_files = true                           *
  *                                                                            *
  *  To add a route here pass jsroute=True to the route definition in the app  *
  *                                                                            *
@@ -27,7 +28,7 b' function registerRCRoutes() {'
     pyroutes.register('changeset_comment', '/%(repo_name)s/changeset/%(revision)s/comment', ['repo_name', 'revision']);
     pyroutes.register('changeset_comment_preview', '/%(repo_name)s/changeset/comment/preview', ['repo_name']);
     pyroutes.register('changeset_comment_delete', '/%(repo_name)s/changeset/comment/%(comment_id)s/delete', ['repo_name', 'comment_id']);
-    pyroutes.register('changeset_info', '/changeset_info/%(repo_name)s/%(revision)s', ['repo_name', 'revision']);
+    pyroutes.register('changeset_info', '/%(repo_name)s/changeset_info/%(revision)s', ['repo_name', 'revision']);
     pyroutes.register('compare_url', '/%(repo_name)s/compare/%(source_ref_type)s@%(source_ref)s...%(target_ref_type)s@%(target_ref)s', ['repo_name', 'source_ref_type', 'source_ref', 'target_ref_type', 'target_ref']);
     pyroutes.register('pullrequest_home', '/%(repo_name)s/pull-request/new', ['repo_name']);
     pyroutes.register('pullrequest', '/%(repo_name)s/pull-request/new', ['repo_name']);
@@ -44,7 +45,7 b' function registerRCRoutes() {'
     pyroutes.register('files_authors_home', '/%(repo_name)s/authors/%(revision)s/%(f_path)s', ['repo_name', 'revision', 'f_path']);
     pyroutes.register('files_archive_home', '/%(repo_name)s/archive/%(fname)s', ['repo_name', 'fname']);
     pyroutes.register('files_nodelist_home', '/%(repo_name)s/nodelist/%(revision)s/%(f_path)s', ['repo_name', 'revision', 'f_path']);
-    pyroutes.register('files_metadata_list_home', '/%(repo_name)s/metadata_list/%(revision)s/%(f_path)s', ['repo_name', 'revision', 'f_path']);
+    pyroutes.register('files_nodetree_full', '/%(repo_name)s/nodetree_full/%(commit_id)s/%(f_path)s', ['repo_name', 'commit_id', 'f_path']);
     pyroutes.register('summary_home_slash', '/%(repo_name)s/', ['repo_name']);
     pyroutes.register('summary_home', '/%(repo_name)s', ['repo_name']);
 }

rhodecode/public/js/src/codemirror/codemirror.js

@@ -13,7 +13,7 b''
   else if (typeof define == "function" && define.amd) // AMD
     return define([], mod);
   else // Plain browser env
-    this.CodeMirror = mod();
+    (this || window).CodeMirror = mod();
 })(function() {
   "use strict";
 
@@ -21,27 +21,29 b''
 
   // Kludges for bugs and behavior differences that can't be feature
   // detected are enabled based on userAgent etc sniffing.
-
-  var gecko = /gecko\/\d/i.test(navigator.userAgent);
-  var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
-  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(navigator.userAgent);
+  var userAgent = navigator.userAgent;
+  var platform = navigator.platform;
+
+  var gecko = /gecko\/\d/i.test(userAgent);
+  var ie_upto10 = /MSIE \d/.test(userAgent);
+  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent);
   var ie = ie_upto10 || ie_11up;
   var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]);
-  var webkit = /WebKit\//.test(navigator.userAgent);
-  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
-  var chrome = /Chrome\//.test(navigator.userAgent);
-  var presto = /Opera\//.test(navigator.userAgent);
+  var webkit = /WebKit\//.test(userAgent);
+  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent);
+  var chrome = /Chrome\//.test(userAgent);
+  var presto = /Opera\//.test(userAgent);
   var safari = /Apple Computer/.test(navigator.vendor);
-  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent);
-  var phantom = /PhantomJS/.test(navigator.userAgent);
-
-  var ios = /AppleWebKit/.test(navigator.userAgent) && /Mobile\/\w+/.test(navigator.userAgent);
+  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent);
+  var phantom = /PhantomJS/.test(userAgent);
+
+  var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent);
   // This is woefully incomplete. Suggestions for alternative methods welcome.
-  var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(navigator.userAgent);
-  var mac = ios || /Mac/.test(navigator.platform);
-  var windows = /win/i.test(navigator.platform);
-
-  var presto_version = presto && navigator.userAgent.match(/Version\/(\d*\.\d*)/);
+  var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent);
+  var mac = ios || /Mac/.test(platform);
+  var windows = /win/i.test(platform);
+
+  var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/);
   if (presto_version) presto_version = Number(presto_version[1]);
   if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
   // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
@@ -65,7 +67,7 b''
     setGuttersForLineNumbers(options);
 
     var doc = options.value;
-    if (typeof doc == "string") doc = new Doc(doc, options.mode);
+    if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator);
     this.doc = doc;
 
     var input = new CodeMirror.inputStyles[options.inputStyle](this);
@@ -87,6 +89,7 b''
       focused: false,
       suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
       pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
+      selectingText: false,
       draggingText: false,
       highlight: new Delayed(), // stores highlight worker timeout
       keySeq: null,  // Unfinished key sequence
@@ -407,7 +410,7 b''
       if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal");
     });
 
-    this.checkedOverlay = false;
+    this.checkedZeroWidth = false;
     // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
     if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px";
   }
@@ -442,29 +445,43 b''
         this.horiz.firstChild.style.width = "0";
       }
 
-      if (!this.checkedOverlay && measure.clientHeight > 0) {
-        if (sWidth == 0) this.overlayHack();
-        this.checkedOverlay = true;
+      if (!this.checkedZeroWidth && measure.clientHeight > 0) {
+        if (sWidth == 0) this.zeroWidthHack();
+        this.checkedZeroWidth = true;
       }
 
       return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0};
     },
     setScrollLeft: function(pos) {
       if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos;
+      if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz);
     },
     setScrollTop: function(pos) {
       if (this.vert.scrollTop != pos) this.vert.scrollTop = pos;
-    },
-    overlayHack: function() {
+      if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert);
+    },
+    zeroWidthHack: function() {
       var w = mac && !mac_geMountainLion ? "12px" : "18px";
-      this.horiz.style.minHeight = this.vert.style.minWidth = w;
-      var self = this;
-      var barMouseDown = function(e) {
-        if (e_target(e) != self.vert && e_target(e) != self.horiz)
-          operation(self.cm, onMouseDown)(e);
-      };
-      on(this.vert, "mousedown", barMouseDown);
-      on(this.horiz, "mousedown", barMouseDown);
+      this.horiz.style.height = this.vert.style.width = w;
+      this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none";
+      this.disableHoriz = new Delayed;
+      this.disableVert = new Delayed;
+    },
+    enableZeroWidthBar: function(bar, delay) {
+      bar.style.pointerEvents = "auto";
+      function maybeDisable() {
+        // To find out whether the scrollbar is still visible, we
+        // check whether the element under the pixel in the bottom
+        // left corner of the scrollbar box is the scrollbar box
+        // itself (when the bar is still visible) or its filler child
+        // (when the bar is hidden). If it is still visible, we keep
+        // it enabled, if it's hidden, we disable pointer events.
+        var box = bar.getBoundingClientRect();
+        var elt = document.elementFromPoint(box.left + 1, box.bottom - 1);
+        if (elt != bar) bar.style.pointerEvents = "none";
+        else delay.set(1000, maybeDisable);
+      }
+      delay.set(1000, maybeDisable);
     },
     clear: function() {
       var parent = this.horiz.parentNode;
@@ -714,7 +731,7 b''
     // width and height.
     removeChildren(display.cursorDiv);
     removeChildren(display.selectionDiv);
-    display.gutters.style.height = 0;
+    display.gutters.style.height = display.sizer.style.minHeight = 0;
 
     if (different) {
       display.lastWrapHeight = update.wrapperHeight;
@@ -806,7 +823,7 b''
   // given line.
   function updateWidgetHeight(line) {
     if (line.widgets) for (var i = 0; i < line.widgets.length; ++i)
-      line.widgets[i].height = line.widgets[i].node.offsetHeight;
+      line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight;
   }
 
   // Do a bulk-read of the DOM positions and sizes needed to draw the
@@ -955,12 +972,22 b''
       lineView.node.removeChild(lineView.gutter);
       lineView.gutter = null;
     }
+    if (lineView.gutterBackground) {
+      lineView.node.removeChild(lineView.gutterBackground);
+      lineView.gutterBackground = null;
+    }
+    if (lineView.line.gutterClass) {
+      var wrap = ensureLineWrapped(lineView);
+      lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
+                                      "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
+                                      "px; width: " + dims.gutterTotalWidth + "px");
+      wrap.insertBefore(lineView.gutterBackground, lineView.text);
+    }
     var markers = lineView.line.gutterMarkers;
     if (cm.options.lineNumbers || markers) {
       var wrap = ensureLineWrapped(lineView);
       var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
-                                             (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
-                                             "px; width: " + dims.gutterTotalWidth + "px");
+                                             (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px");
       cm.display.input.setUneditable(gutterWrap);
       wrap.insertBefore(gutterWrap, lineView.text);
       if (lineView.line.gutterClass)
@@ -1067,10 +1094,6 b''
     if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
   }
 
-  function isReadOnly(cm) {
-    return cm.options.readOnly || cm.doc.cantEdit;
-  }
-
   // This will be set to an array of strings when copying, so that,
   // when pasting, we know what kind of selections the copied text
   // was made out of.
@@ -1082,13 +1105,18 b''
     if (!sel) sel = doc.sel;
 
     var paste = cm.state.pasteIncoming || origin == "paste";
-    var textLines = splitLines(inserted), multiPaste = null;
+    var textLines = doc.splitLines(inserted), multiPaste = null;
     // When pasing N lines into N selections, insert one line per selection
     if (paste && sel.ranges.length > 1) {
-      if (lastCopied && lastCopied.join("\n") == inserted)
-        multiPaste = sel.ranges.length % lastCopied.length == 0 && map(lastCopied, splitLines);
-      else if (textLines.length == sel.ranges.length)
+      if (lastCopied && lastCopied.join("\n") == inserted) {
+        if (sel.ranges.length % lastCopied.length == 0) {
+          multiPaste = [];
+          for (var i = 0; i < lastCopied.length; i++)
+            multiPaste.push(doc.splitLines(lastCopied[i]));
+        }
+      } else if (textLines.length == sel.ranges.length) {
         multiPaste = map(textLines, function(l) { return [l]; });
+      }
     }
 
     // Normal behavior is to insert the new text into every selection
@@ -1120,7 +1148,8 b''
     var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
     if (pasted) {
       e.preventDefault();
-      runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
+      if (!cm.isReadOnly() && !cm.options.disableInput)
+        runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
       return true;
     }
   }
@@ -1222,13 +1251,14 b''
       });
 
       on(te, "paste", function(e) {
-        if (handlePaste(e, cm)) return true;
+        if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
 
         cm.state.pasteIncoming = true;
         input.fastPoll();
       });
 
       function prepareCopyCut(e) {
+        if (signalDOMEvent(cm, e)) return
         if (cm.somethingSelected()) {
           lastCopied = cm.getSelections();
           if (input.inaccurateSelection) {
@@ -1256,7 +1286,7 b''
       on(te, "copy", prepareCopyCut);
 
       on(display.scroller, "paste", function(e) {
-        if (eventInWidget(display, e)) return;
+        if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return;
         cm.state.pasteIncoming = true;
         input.focus();
       });
@@ -1268,6 +1298,7 b''
 
       on(te, "compositionstart", function() {
         var start = cm.getCursor("from");
+        if (input.composing) input.composing.range.clear()
         input.composing = {
           start: start,
           range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
@@ -1388,8 +1419,8 b''
       // will be the case when there is a lot of text in the textarea,
       // in which case reading its value would be expensive.
       if (this.contextMenuPending || !cm.state.focused ||
-          (hasSelection(input) && !prevInput) ||
-          isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
+          (hasSelection(input) && !prevInput && !this.composing) ||
+          cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
         return false;
 
       var text = input.value;
@@ -1516,6 +1547,10 b''
       }
     },
 
+    readOnlyChanged: function(val) {
+      if (!val) this.reset();
+    },
+
     setUneditable: nothing,
 
     needsContentAttribute: false
@@ -1534,10 +1569,11 b''
     init: function(display) {
       var input = this, cm = input.cm;
       var div = input.div = display.lineDiv;
-      div.contentEditable = "true";
       disableBrowserMagic(div);
 
-      on(div, "paste", function(e) { handlePaste(e, cm); })
+      on(div, "paste", function(e) {
+        if (!signalDOMEvent(cm, e)) handlePaste(e, cm);
+      })
 
       on(div, "compositionstart", function(e) {
         var data = e.data;
@@ -1575,11 +1611,12 b''
 
       on(div, "input", function() {
         if (input.composing) return;
-        if (!input.pollContent())
+        if (cm.isReadOnly() || !input.pollContent())
           runInOp(input.cm, function() {regChange(cm);});
       });
 
       function onCopyCut(e) {
+        if (signalDOMEvent(cm, e)) return
         if (cm.somethingSelected()) {
           lastCopied = cm.getSelections();
           if (e.type == "cut") cm.replaceSelection("", null, "cut");
@@ -1655,8 +1692,13 b''
       try { var rng = range(start.node, start.offset, end.offset, end.node); }
       catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
       if (rng) {
-        sel.removeAllRanges();
-        sel.addRange(rng);
+        if (!gecko && this.cm.state.focused) {
+          sel.collapse(start.node, start.offset);
+          if (!rng.collapsed) sel.addRange(rng);
+        } else {
+          sel.removeAllRanges();
+          sel.addRange(rng);
+        }
         if (old && sel.anchorNode == null) sel.addRange(old);
         else if (gecko) this.startGracePeriod();
       }
@@ -1756,7 +1798,7 b''
         var toNode = display.view[toIndex + 1].node.previousSibling;
       }
 
-      var newText = splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
+      var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
       var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
       while (newText.length > 1 && oldText.length > 1) {
         if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
@@ -1800,17 +1842,24 b''
       this.div.focus();
     },
     applyComposition: function(composing) {
-      if (composing.data && composing.data != composing.startData)
+      if (this.cm.isReadOnly())
+        operation(this.cm, regChange)(this.cm)
+      else if (composing.data && composing.data != composing.startData)
         operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
     },
 
     setUneditable: function(node) {
-      node.setAttribute("contenteditable", "false");
+      node.contentEditable = "false"
     },
 
     onKeyPress: function(e) {
       e.preventDefault();
-      operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
+      if (!this.cm.isReadOnly())
+        operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
+    },
+
+    readOnlyChanged: function(val) {
+      this.div.contentEditable = String(val != "nocursor")
     },
 
     onContextMenu: nothing,
@@ -1912,7 +1961,7 b''
   }
 
   function domTextBetween(cm, from, to, fromLine, toLine) {
-    var text = "", closing = false;
+    var text = "", closing = false, lineSep = cm.doc.lineSeparator();
     function recognizeMarker(id) { return function(marker) { return marker.id == id; }; }
     function walk(node) {
       if (node.nodeType == 1) {
@@ -1926,7 +1975,7 b''
         if (markerID) {
           var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
           if (found.length && (range = found[0].find()))
-            text += getBetween(cm.doc, range.from, range.to).join("\n");
+            text += getBetween(cm.doc, range.from, range.to).join(lineSep);
           return;
         }
         if (node.getAttribute("contenteditable") == "false") return;
@@ -1938,7 +1987,7 b''
         var val = node.nodeValue;
         if (!val) return;
         if (closing) {
-          text += "\n";
+          text += lineSep;
           closing = false;
         }
         text += val;
@@ -2110,7 +2159,7 b''
 
   // Give beforeSelectionChange handlers a change to influence a
   // selection update.
-  function filterSelectionChange(doc, sel) {
+  function filterSelectionChange(doc, sel, options) {
     var obj = {
       ranges: sel.ranges,
       update: function(ranges) {
@@ -2118,7 +2167,8 b''
         for (var i = 0; i < ranges.length; i++)
           this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
                                      clipPos(doc, ranges[i].head));
-      }
+      },
+      origin: options && options.origin
     };
     signal(doc, "beforeSelectionChange", doc, obj);
     if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
@@ -2144,7 +2194,7 b''
 
   function setSelectionNoUndo(doc, sel, options) {
     if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
-      sel = filterSelectionChange(doc, sel);
+      sel = filterSelectionChange(doc, sel, options);
 
     var bias = options && options.bias ||
       (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
@@ -2178,8 +2228,9 b''
     var out;
     for (var i = 0; i < sel.ranges.length; i++) {
       var range = sel.ranges[i];
-      var newAnchor = skipAtomic(doc, range.anchor, bias, mayClear);
-      var newHead = skipAtomic(doc, range.head, bias, mayClear);
+      var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i];
+      var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear);
+      var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear);
       if (out || newAnchor != range.anchor || newHead != range.head) {
         if (!out) out = sel.ranges.slice(0, i);
         out[i] = new Range(newAnchor, newHead);
@@ -2188,54 +2239,59 b''
     return out ? normalizeSelection(out, sel.primIndex) : sel;
   }
 
-  // Ensure a given position is not inside an atomic range.
-  function skipAtomic(doc, pos, bias, mayClear) {
-    var flipped = false, curPos = pos;
-    var dir = bias || 1;
-    doc.cantEdit = false;
-    search: for (;;) {
-      var line = getLine(doc, curPos.line);
-      if (line.markedSpans) {
-        for (var i = 0; i < line.markedSpans.length; ++i) {
-          var sp = line.markedSpans[i], m = sp.marker;
-          if ((sp.from == null || (m.inclusiveLeft ? sp.from <= curPos.ch : sp.from < curPos.ch)) &&
-              (sp.to == null || (m.inclusiveRight ? sp.to >= curPos.ch : sp.to > curPos.ch))) {
-            if (mayClear) {
-              signal(m, "beforeCursorEnter");
-              if (m.explicitlyCleared) {
-                if (!line.markedSpans) break;
-                else {--i; continue;}
-              }
-            }
-            if (!m.atomic) continue;
-            var newPos = m.find(dir < 0 ? -1 : 1);
-            if (cmp(newPos, curPos) == 0) {
-              newPos.ch += dir;
-              if (newPos.ch < 0) {
-                if (newPos.line > doc.first) newPos = clipPos(doc, Pos(newPos.line - 1));
-                else newPos = null;
-              } else if (newPos.ch > line.text.length) {
-                if (newPos.line < doc.first + doc.size - 1) newPos = Pos(newPos.line + 1, 0);
-                else newPos = null;
-              }
-              if (!newPos) {
-                if (flipped) {
-                  // Driven in a corner -- no valid cursor position found at all
-                  // -- try again *with* clearing, if we didn't already
-                  if (!mayClear) return skipAtomic(doc, pos, bias, true);
-                  // Otherwise, turn off editing until further notice, and return the start of the doc
-                  doc.cantEdit = true;
-                  return Pos(doc.first, 0);
-                }
-                flipped = true; newPos = pos; dir = -dir;
-              }
-            }
-            curPos = newPos;
-            continue search;
+  function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
+    var line = getLine(doc, pos.line);
+    if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
+      var sp = line.markedSpans[i], m = sp.marker;
+      if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
+          (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
+        if (mayClear) {
+          signal(m, "beforeCursorEnter");
+          if (m.explicitlyCleared) {
+            if (!line.markedSpans) break;
+            else {--i; continue;}
           }
         }
-      }
-      return curPos;
+        if (!m.atomic) continue;
+
+        if (oldPos) {
+          var near = m.find(dir < 0 ? 1 : -1), diff;
+          if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft) near = movePos(doc, near, -dir, line);
+          if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
+            return skipAtomicInner(doc, near, pos, dir, mayClear);
+        }
+
+        var far = m.find(dir < 0 ? -1 : 1);
+        if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight) far = movePos(doc, far, dir, line);
+        return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null;
+      }
+    }
+    return pos;
+  }
+
+  // Ensure a given position is not inside an atomic range.
+  function skipAtomic(doc, pos, oldPos, bias, mayClear) {
+    var dir = bias || 1;
+    var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
+        (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
+        skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
+        (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true));
+    if (!found) {
+      doc.cantEdit = true;
+      return Pos(doc.first, 0);
+    }
+    return found;
+  }
+
+  function movePos(doc, pos, dir, line) {
+    if (dir < 0 && pos.ch == 0) {
+      if (pos.line > doc.first) return clipPos(doc, Pos(pos.line - 1));
+      else return null;
+    } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) {
+      if (pos.line < doc.first + doc.size - 1) return Pos(pos.line + 1, 0);
+      else return null;
+    } else {
+      return new Pos(pos.line, pos.ch + dir);
     }
   }
 
@@ -2255,7 +2311,7 b''
       var range = doc.sel.ranges[i];
       var collapsed = range.empty();
       if (collapsed || cm.options.showCursorWhenSelecting)
-        drawSelectionCursor(cm, range, curFragment);
+        drawSelectionCursor(cm, range.head, curFragment);
       if (!collapsed)
         drawSelectionRange(cm, range, selFragment);
     }
@@ -2263,8 +2319,8 b''
   }
 
   // Draws a cursor for the given range
-  function drawSelectionCursor(cm, range, output) {
-    var pos = cursorCoords(cm, range.head, "div", null, null, !cm.options.singleCursorHeightPerLine);
+  function drawSelectionCursor(cm, head, output) {
+    var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine);
 
     var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
     cursor.style.left = pos.left + "px";
@@ -2388,8 +2444,8 b''
 
     doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
       if (doc.frontier >= cm.display.viewFrom) { // Visible
-        var oldStyles = line.styles;
-        var highlighted = highlightLine(cm, line, state, true);
+        var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength;
+        var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true);
         line.styles = highlighted.styles;
         var oldCls = line.styleClasses, newCls = highlighted.classes;
         if (newCls) line.styleClasses = newCls;
@@ -2398,9 +2454,10 b''
           oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
         for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
         if (ischange) changedLines.push(doc.frontier);
-        line.stateAfter = copyState(doc.mode, state);
+        line.stateAfter = tooLong ? state : copyState(doc.mode, state);
       } else {
-        processLine(cm, line.text, state);
+        if (line.text.length <= cm.options.maxHighlightLength)
+          processLine(cm, line.text, state);
         line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null;
       }
       ++doc.frontier;
@@ -2545,10 +2602,12 b''
   function prepareMeasureForLine(cm, line) {
     var lineN = lineNo(line);
     var view = findViewForLine(cm, lineN);
-    if (view && !view.text)
+    if (view && !view.text) {
       view = null;
-    else if (view && view.changes)
+    } else if (view && view.changes) {
       updateLineForChanges(cm, view, lineN, getDimensions(cm));
+      cm.curOp.forceUpdate = true;
+    }
     if (!view)
       view = updateExternalMeasurement(cm, line);
 
@@ -2961,12 +3020,12 b''
     var callbacks = group.delayedCallbacks, i = 0;
     do {
       for (; i < callbacks.length; i++)
-        callbacks[i]();
+        callbacks[i].call(null);
       for (var j = 0; j < group.ops.length; j++) {
         var op = group.ops[j];
         if (op.cursorActivityHandlers)
           while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
-            op.cursorActivityHandlers[op.cursorActivityCalled++](op.cm);
+            op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm);
       }
     } while (i < callbacks.length);
   }
@@ -3060,7 +3119,8 b''
 
     if (cm.state.focused && op.updateInput)
       cm.display.input.reset(op.typing);
-    if (op.focus && op.focus == activeElt()) ensureFocus(op.cm);
+    if (op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus()))
+      ensureFocus(op.cm);
   }
 
   function endOperation_finish(op) {
@@ -3375,7 +3435,7 b''
       return dx * dx + dy * dy > 20 * 20;
     }
     on(d.scroller, "touchstart", function(e) {
-      if (!isMouseLikeTouchEvent(e)) {
+      if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
         clearTimeout(touchFinished);
         var now = +new Date;
         d.activeTouch = {start: now, moved: false,
@@ -3426,9 +3486,11 b''
     on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
 
     d.dragFunctions = {
-      simple: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);},
+      enter: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);},
+      over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
       start: function(e){onDragStart(cm, e);},
-      drop: operation(cm, onDrop)
+      drop: operation(cm, onDrop),
+      leave: function() {clearDragCursor(cm);}
     };
 
     var inp = d.input.getField();
@@ -3445,8 +3507,9 b''
       var funcs = cm.display.dragFunctions;
       var toggle = value ? on : off;
       toggle(cm.display.scroller, "dragstart", funcs.start);
-      toggle(cm.display.scroller, "dragenter", funcs.simple);
-      toggle(cm.display.scroller, "dragover", funcs.simple);
+      toggle(cm.display.scroller, "dragenter", funcs.enter);
+      toggle(cm.display.scroller, "dragover", funcs.over);
+      toggle(cm.display.scroller, "dragleave", funcs.leave);
       toggle(cm.display.scroller, "drop", funcs.drop);
     }
   }
@@ -3501,7 +3564,7 b''
   // not interfere with, such as a scrollbar or widget.
   function onMouseDown(e) {
     var cm = this, display = cm.display;
-    if (display.activeTouch && display.input.supportsTouch() || signalDOMEvent(cm, e)) return;
+    if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return;
     display.shift = e.shiftKey;
 
     if (eventInWidget(display, e)) {
@@ -3519,7 +3582,10 b''
 
     switch (e_button(e)) {
     case 1:
-      if (start)
+      // #3261: make sure, that we're not starting a second selection
+      if (cm.state.selectingText)
+        cm.state.selectingText(e);
+      else if (start)
         leftButtonDown(cm, e, start);
       else if (e_target(e) == display.scroller)
         e_preventDefault(e);
@@ -3554,7 +3620,7 b''
     }
 
     var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
-    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) &&
+    if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
         type == "single" && (contained = sel.contains(start)) > -1 &&
         (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
         (cmp(contained.to(), start) > 0 || start.xRel < 0))
@@ -3639,7 +3705,8 b''
       setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
                    {scroll: false, origin: "*mouse"});
     } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
-      setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0));
+      setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
+                   {scroll: false, origin: "*mouse"});
       startSel = doc.sel;
     } else {
       replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
@@ -3717,6 +3784,7 b''
     }
 
     function done(e) {
+      cm.state.selectingText = false;
       counter = Infinity;
       e_preventDefault(e);
       display.input.focus();
@@ -3730,13 +3798,14 b''
       else extend(e);
     });
     var up = operation(cm, done);
+    cm.state.selectingText = up;
     on(document, "mousemove", move);
     on(document, "mouseup", up);
   }
 
   // Determines whether an event happened in the gutter, and fires the
   // handlers for the corresponding event.
-  function gutterEvent(cm, e, type, prevent, signalfn) {
+  function gutterEvent(cm, e, type, prevent) {
     try { var mX = e.clientX, mY = e.clientY; }
     catch(e) { return false; }
     if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false;
@@ -3753,14 +3822,14 b''
       if (g && g.getBoundingClientRect().right >= mX) {
         var line = lineAtHeight(cm.doc, mY);
         var gutter = cm.options.gutters[i];
-        signalfn(cm, type, cm, line, gutter, e);
+        signal(cm, type, cm, line, gutter, e);
         return e_defaultPrevented(e);
       }
     }
   }
 
   function clickInGutter(cm, e) {
-    return gutterEvent(cm, e, "gutterClick", true, signalLater);
+    return gutterEvent(cm, e, "gutterClick", true);
   }
 
   // Kludge to work around strange IE behavior where it'll sometimes
@@ -3769,23 +3838,32 b''
 
   function onDrop(e) {
     var cm = this;
+    clearDragCursor(cm);
     if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
       return;
     e_preventDefault(e);
     if (ie) lastDrop = +new Date;
     var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
-    if (!pos || isReadOnly(cm)) return;
+    if (!pos || cm.isReadOnly()) return;
     // Might be a file drop, in which case we simply extract the text
     // and insert it.
     if (files && files.length && window.FileReader && window.File) {
       var n = files.length, text = Array(n), read = 0;
       var loadFile = function(file, i) {
+        if (cm.options.allowDropFileTypes &&
+            indexOf(cm.options.allowDropFileTypes, file.type) == -1)
+          return;
+
         var reader = new FileReader;
         reader.onload = operation(cm, function() {
-          text[i] = reader.result;
+          var content = reader.result;
+          if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = "";
+          text[i] = content;
           if (++read == n) {
             pos = clipPos(cm.doc, pos);
-            var change = {from: pos, to: pos, text: splitLines(text.join("\n")), origin: "paste"};
+            var change = {from: pos, to: pos,
+                          text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
+                          origin: "paste"};
             makeChange(cm.doc, change);
             setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
           }
@@ -3839,6 +3917,25 b''
     }
   }
 
+  function onDragOver(cm, e) {
+    var pos = posFromMouse(cm, e);
+    if (!pos) return;
+    var frag = document.createDocumentFragment();
+    drawSelectionCursor(cm, pos, frag);
+    if (!cm.display.dragCursor) {
+      cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors");
+      cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv);
+    }
+    removeChildrenAndAdd(cm.display.dragCursor, frag);
+  }
+
+  function clearDragCursor(cm) {
+    if (cm.display.dragCursor) {
+      cm.display.lineSpace.removeChild(cm.display.dragCursor);
+      cm.display.dragCursor = null;
+    }
+  }
+
   // SCROLL EVENTS
 
   // Sync the scrollable area and scrollbars, ensure the viewport
@@ -3903,8 +4000,9 b''
 
     var display = cm.display, scroll = display.scroller;
     // Quit if there's nothing to scroll here
-    if (!(dx && scroll.scrollWidth > scroll.clientWidth ||
-          dy && scroll.scrollHeight > scroll.clientHeight)) return;
+    var canScrollX = scroll.scrollWidth > scroll.clientWidth;
+    var canScrollY = scroll.scrollHeight > scroll.clientHeight;
+    if (!(dx && canScrollX || dy && canScrollY)) return;
 
     // Webkit browsers on OS X abort momentum scrolls when the target
     // of the scroll event is removed from the scrollable element.
@@ -3928,10 +4026,15 b''
     // scrolling entirely here. It'll be slightly off from native, but
     // better than glitching out.
     if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
-      if (dy)
+      if (dy && canScrollY)
         setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
       setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
-      e_preventDefault(e);
+      // Only prevent default scrolling if vertical scrolling is
+      // actually possible. Otherwise, it causes vertical scroll
+      // jitter on OSX trackpads when deltaX is small and deltaY
+      // is large (issue #3579)
+      if (!dy || (dy && canScrollY))
+        e_preventDefault(e);
       display.wheelStartX = null; // Abort measurement, if in progress
       return;
     }
@@ -3980,7 +4083,7 b''
     cm.display.input.ensurePolled();
     var prevShift = cm.display.shift, done = false;
     try {
-      if (isReadOnly(cm)) cm.state.suppressEdits = true;
+      if (cm.isReadOnly()) cm.state.suppressEdits = true;
       if (dropShift) cm.display.shift = false;
       done = bound(cm) != Pass;
     } finally {
@@ -4159,12 +4262,13 b''
   // right-click take effect on it.
   function onContextMenu(cm, e) {
     if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return;
+    if (signalDOMEvent(cm, e, "contextmenu")) return;
     cm.display.input.onContextMenu(e);
   }
 
   function contextMenuInGutter(cm, e) {
     if (!hasHandler(cm, "gutterContextMenu")) return false;
-    return gutterEvent(cm, e, "gutterContextMenu", false, signal);
+    return gutterEvent(cm, e, "gutterContextMenu", false);
   }
 
   // UPDATING
@@ -4468,7 +4572,7 b''
   function replaceRange(doc, code, from, to, origin) {
     if (!to) to = from;
     if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp; }
-    if (typeof code == "string") code = splitLines(code);
+    if (typeof code == "string") code = doc.splitLines(code);
     makeChange(doc, {from: from, to: to, text: code, origin: origin});
   }
 
@@ -4712,10 +4816,9 b''
   function findPosH(doc, pos, dir, unit, visually) {
     var line = pos.line, ch = pos.ch, origDir = dir;
     var lineObj = getLine(doc, line);
-    var possible = true;
     function findNextLine() {
       var l = line + dir;
-      if (l < doc.first || l >= doc.first + doc.size) return (possible = false);
+      if (l < doc.first || l >= doc.first + doc.size) return false
       line = l;
       return lineObj = getLine(doc, l);
     }
@@ -4725,14 +4828,16 b''
         if (!boundToLine && findNextLine()) {
           if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj);
           else ch = dir < 0 ? lineObj.text.length : 0;
-        } else return (possible = false);
+        } else return false
       } else ch = next;
       return true;
     }
 
-    if (unit == "char") moveOnce();
-    else if (unit == "column") moveOnce(true);
-    else if (unit == "word" || unit == "group") {
+    if (unit == "char") {
+      moveOnce()
+    } else if (unit == "column") {
+      moveOnce(true)
+    } else if (unit == "word" || unit == "group") {
       var sawType = null, group = unit == "group";
       var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
       for (var first = true;; first = false) {
@@ -4752,8 +4857,8 b''
         if (dir > 0 && !moveOnce(!first)) break;
       }
     }
-    var result = skipAtomic(doc, Pos(line, ch), origDir, true);
-    if (!possible) result.hitSide = true;
+    var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true);
+    if (!cmp(pos, result)) result.hitSide = true;
     return result;
   }
 
@@ -5045,7 +5150,7 b''
 
     execCommand: function(cmd) {
       if (commands.hasOwnProperty(cmd))
-        return commands[cmd](this);
+        return commands[cmd].call(null, this);
     },
 
     triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),
@@ -5140,6 +5245,7 b''
       signal(this, "overwriteToggle", this, this.state.overwrite);
     },
     hasFocus: function() { return this.display.input.getField() == activeElt(); },
+    isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit); },
 
     scrollTo: methodOp(function(x, y) {
       if (x != null || y != null) resolveScrollToPos(this);
@@ -5263,6 +5369,22 b''
     clearCaches(cm);
     regChange(cm);
   }, true);
+  option("lineSeparator", null, function(cm, val) {
+    cm.doc.lineSep = val;
+    if (!val) return;
+    var newBreaks = [], lineNo = cm.doc.first;
+    cm.doc.iter(function(line) {
+      for (var pos = 0;;) {
+        var found = line.text.indexOf(val, pos);
+        if (found == -1) break;
+        pos = found + val.length;
+        newBreaks.push(Pos(lineNo, found));
+      }
+      lineNo++;
+    });
+    for (var i = newBreaks.length - 1; i >= 0; i--)
+      replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
+  });
   option("specialChars", /[\t\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
     cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
     if (old != CodeMirror.Init) cm.refresh();
@@ -5321,11 +5443,12 b''
       cm.display.disabled = true;
     } else {
       cm.display.disabled = false;
-      if (!val) cm.display.input.reset();
-    }
+    }
+    cm.display.input.readOnlyChanged(val)
   });
   option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
   option("dragDrop", true, dragDropChanged);
+  option("allowDropFileTypes", null);
 
   option("cursorBlinkRate", 530);
   option("cursorScrollMargin", 0);
@@ -5613,7 +5736,8 b''
             } else if (cur.line > cm.doc.first) {
               var prev = getLine(cm.doc, cur.line - 1).text;
               if (prev)
-                cm.replaceRange(line.charAt(0) + "\n" + prev.charAt(prev.length - 1),
+                cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
+                                prev.charAt(prev.length - 1),
                                 Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose");
             }
           }
@@ -5627,10 +5751,10 b''
         var len = cm.listSelections().length;
         for (var i = 0; i < len; i++) {
           var range = cm.listSelections()[i];
-          cm.replaceRange("\n", range.anchor, range.head, "+input");
+          cm.replaceRange(cm.doc.lineSeparator(), range.anchor, range.head, "+input");
           cm.indentLine(range.from().line + 1, null, true);
-          ensureCursorVisible(cm);
         }
+        ensureCursorVisible(cm);
       });
     },
     toggleOverwrite: function(cm) {cm.toggleOverwrite();}
@@ -6558,7 +6682,7 b''
         parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;";
       removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
     }
-    return widget.height = widget.node.offsetHeight;
+    return widget.height = widget.node.parentNode.offsetHeight;
   }
 
   function addLineWidget(doc, handle, node, options) {
@@ -6747,7 +6871,9 b''
 
   function getLineStyles(cm, line, updateFrontier) {
     if (!line.styles || line.styles[0] != cm.state.modeGen) {
-      var result = highlightLine(cm, line, line.stateAfter = getStateBefore(cm, lineNo(line)));
+      var state = getStateBefore(cm, lineNo(line));
+      var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state);
+      line.stateAfter = state;
       line.styles = result.styles;
       if (result.classes) line.styleClasses = result.classes;
       else if (line.styleClasses) line.styleClasses = null;
@@ -6764,7 +6890,7 b''
     var stream = new StringStream(text, cm.options.tabSize);
     stream.start = stream.pos = startAt || 0;
     if (text == "") callBlankLine(mode, state);
-    while (!stream.eol() && stream.pos <= cm.options.maxHighlightLength) {
+    while (!stream.eol()) {
       readToken(mode, stream, state);
       stream.start = stream.pos;
     }
@@ -6791,7 +6917,7 b''
     // is needed on Webkit to be able to get line-level bounding
     // rectangles for it (in measureChar).
     var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
-    var builder = {pre: elt("pre", [content]), content: content,
+    var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
                    col: 0, pos: 0, cm: cm,
                    splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
     lineView.measure = {};
@@ -6881,6 +7007,10 b''
           txt.setAttribute("role", "presentation");
           txt.setAttribute("cm-text", "\t");
           builder.col += tabWidth;
+        } else if (m[0] == "\r" || m[0] == "\n") {
+          var txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"));
+          txt.setAttribute("cm-text", m[0]);
+          builder.col += 1;
         } else {
           var txt = builder.cm.options.specialCharPlaceholder(m[0]);
           txt.setAttribute("cm-text", m[0]);
@@ -6962,7 +7092,7 b''
       if (nextChange == pos) { // Update current marker set
         spanStyle = spanEndStyle = spanStartStyle = title = css = "";
         collapsed = null; nextChange = Infinity;
-        var foundBookmarks = [];
+        var foundBookmarks = [], endStyles
         for (var j = 0; j < spans.length; ++j) {
           var sp = spans[j], m = sp.marker;
           if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
@@ -6973,9 +7103,9 b''
               spanEndStyle = "";
             }
             if (m.className) spanStyle += " " + m.className;
-            if (m.css) css = m.css;
+            if (m.css) css = (css ? css + ";" : "") + m.css;
             if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
-            if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
+            if (m.endStyle && sp.to == nextChange) (endStyles || (endStyles = [])).push(m.endStyle, sp.to)
             if (m.title && !title) title = m.title;
             if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
               collapsed = sp;
@@ -6983,14 +7113,17 b''
             nextChange = sp.from;
           }
         }
+        if (endStyles) for (var j = 0; j < endStyles.length; j += 2)
+          if (endStyles[j + 1] == nextChange) spanEndStyle += " " + endStyles[j]
+
+        if (!collapsed || collapsed.from == pos) for (var j = 0; j < foundBookmarks.length; ++j)
+          buildCollapsedSpan(builder, 0, foundBookmarks[j]);
         if (collapsed && (collapsed.from || 0) == pos) {
           buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
                              collapsed.marker, collapsed.from == null);
           if (collapsed.to == null) return;
           if (collapsed.to == pos) collapsed = false;
         }
-        if (!collapsed && foundBookmarks.length) for (var j = 0; j < foundBookmarks.length; ++j)
-          buildCollapsedSpan(builder, 0, foundBookmarks[j]);
       }
       if (pos >= len) break;
 
@@ -7226,8 +7359,8 b''
   };
 
   var nextDocId = 0;
-  var Doc = CodeMirror.Doc = function(text, mode, firstLine) {
-    if (!(this instanceof Doc)) return new Doc(text, mode, firstLine);
+  var Doc = CodeMirror.Doc = function(text, mode, firstLine, lineSep) {
+    if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep);
     if (firstLine == null) firstLine = 0;
 
     BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
@@ -7241,8 +7374,10 b''
     this.history = new History(null);
     this.id = ++nextDocId;
     this.modeOption = mode;
-
-    if (typeof text == "string") text = splitLines(text);
+    this.lineSep = lineSep;
+    this.extend = false;
+
+    if (typeof text == "string") text = this.splitLines(text);
     updateDoc(this, {from: start, to: start, text: text});
     setSelection(this, simpleSelection(start), sel_dontScroll);
   };
@@ -7272,12 +7407,12 b''
     getValue: function(lineSep) {
       var lines = getLines(this, this.first, this.first + this.size);
       if (lineSep === false) return lines;
-      return lines.join(lineSep || "\n");
+      return lines.join(lineSep || this.lineSeparator());
     },
     setValue: docMethodOp(function(code) {
       var top = Pos(this.first, 0), last = this.first + this.size - 1;
       makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
-                        text: splitLines(code), origin: "setValue", full: true}, true);
+                        text: this.splitLines(code), origin: "setValue", full: true}, true);
       setSelection(this, simpleSelection(top));
     }),
     replaceRange: function(code, from, to, origin) {
@@ -7288,7 +7423,7 b''
     getRange: function(from, to, lineSep) {
       var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
       if (lineSep === false) return lines;
-      return lines.join(lineSep || "\n");
+      return lines.join(lineSep || this.lineSeparator());
     },
 
     getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;},
@@ -7328,10 +7463,11 b''
       extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
     }),
     extendSelections: docMethodOp(function(heads, options) {
-      extendSelections(this, clipPosArray(this, heads, options));
+      extendSelections(this, clipPosArray(this, heads), options);
     }),
     extendSelectionsBy: docMethodOp(function(f, options) {
-      extendSelections(this, map(this.sel.ranges, f), options);
+      var heads = map(this.sel.ranges, f);
+      extendSelections(this, clipPosArray(this, heads), options);
     }),
     setSelections: docMethodOp(function(ranges, primary, options) {
       if (!ranges.length) return;
@@ -7354,13 +7490,13 b''
         lines = lines ? lines.concat(sel) : sel;
       }
       if (lineSep === false) return lines;
-      else return lines.join(lineSep || "\n");
+      else return lines.join(lineSep || this.lineSeparator());
     },
     getSelections: function(lineSep) {
       var parts = [], ranges = this.sel.ranges;
       for (var i = 0; i < ranges.length; i++) {
         var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-        if (lineSep !== false) sel = sel.join(lineSep || "\n");
+        if (lineSep !== false) sel = sel.join(lineSep || this.lineSeparator());
         parts[i] = sel;
       }
       return parts;
@@ -7375,7 +7511,7 b''
       var changes = [], sel = this.sel;
       for (var i = 0; i < sel.ranges.length; i++) {
         var range = sel.ranges[i];
-        changes[i] = {from: range.from(), to: range.to(), text: splitLines(code[i]), origin: origin};
+        changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin};
       }
       var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
       for (var i = changes.length - 1; i >= 0; i--)
@@ -7456,7 +7592,7 b''
     removeLineWidget: function(widget) { widget.clear(); },
 
     markText: function(from, to, options) {
-      return markText(this, clipPos(this, from), clipPos(this, to), options, "range");
+      return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range");
     },
     setBookmark: function(pos, options) {
       var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
@@ -7525,7 +7661,8 b''
     },
 
     copy: function(copyHistory) {
-      var doc = new Doc(getLines(this, this.first, this.first + this.size), this.modeOption, this.first);
+      var doc = new Doc(getLines(this, this.first, this.first + this.size),
+                        this.modeOption, this.first, this.lineSep);
       doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
       doc.sel = this.sel;
       doc.extend = false;
@@ -7541,7 +7678,7 b''
       var from = this.first, to = this.first + this.size;
       if (options.from != null && options.from > from) from = options.from;
       if (options.to != null && options.to < to) to = options.to;
-      var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from);
+      var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep);
       if (options.sharedHist) copy.history = this.history;
       (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
       copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
@@ -7570,7 +7707,13 b''
     iterLinkedDocs: function(f) {linkedDocs(this, f);},
 
     getMode: function() {return this.mode;},
-    getEditor: function() {return this.cm;}
+    getEditor: function() {return this.cm;},
+
+    splitLines: function(str) {
+      if (this.lineSep) return str.split(this.lineSep);
+      return splitLinesAuto(str);
+    },
+    lineSeparator: function() { return this.lineSep || "\n"; }
   });
 
   // Public alias.
@@ -8010,24 +8153,30 b''
     }
   };
 
+  var noHandlers = []
+  function getHandlers(emitter, type, copy) {
+    var arr = emitter._handlers && emitter._handlers[type]
+    if (copy) return arr && arr.length > 0 ? arr.slice() : noHandlers
+    else return arr || noHandlers
+  }
+
   var off = CodeMirror.off = function(emitter, type, f) {
     if (emitter.removeEventListener)
       emitter.removeEventListener(type, f, false);
     else if (emitter.detachEvent)
       emitter.detachEvent("on" + type, f);
     else {
-      var arr = emitter._handlers && emitter._handlers[type];
-      if (!arr) return;
-      for (var i = 0; i < arr.length; ++i)
-        if (arr[i] == f) { arr.splice(i, 1); break; }
+      var handlers = getHandlers(emitter, type, false)
+      for (var i = 0; i < handlers.length; ++i)
+        if (handlers[i] == f) { handlers.splice(i, 1); break; }
     }
   };
 
   var signal = CodeMirror.signal = function(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
+    var handlers = getHandlers(emitter, type, true)
+    if (!handlers.length) return;
     var args = Array.prototype.slice.call(arguments, 2);
-    for (var i = 0; i < arr.length; ++i) arr[i].apply(null, args);
+    for (var i = 0; i < handlers.length; ++i) handlers[i].apply(null, args);
   };
 
   var orphanDelayedCallbacks = null;
@@ -8040,8 +8189,8 b''
   // them to be executed when the last operation ends, or, if no
   // operation is active, when a timeout fires.
   function signalLater(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
+    var arr = getHandlers(emitter, type, false)
+    if (!arr.length) return;
     var args = Array.prototype.slice.call(arguments, 2), list;
     if (operationGroup) {
       list = operationGroup.delayedCallbacks;
@@ -8081,8 +8230,7 b''
   }
 
   function hasHandler(emitter, type) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    return arr && arr.length > 0;
+    return getHandlers(emitter, type).length > 0
   }
 
   // Add on and off methods to a constructor's prototype, to make
@@ -8129,7 +8277,7 b''
 
   // The inverse of countColumn -- find the offset that corresponds to
   // a particular column.
-  function findColumn(string, goal, tabSize) {
+  var findColumn = CodeMirror.findColumn = function(string, goal, tabSize) {
     for (var pos = 0, col = 0;;) {
       var nextTab = string.indexOf("\t", pos);
       if (nextTab == -1) nextTab = string.length;
@@ -8269,7 +8417,12 b''
     } while (child = child.parentNode);
   };
 
-  function activeElt() { return document.activeElement; }
+  function activeElt() {
+    var activeElement = document.activeElement;
+    while (activeElement && activeElement.root && activeElement.root.activeElement)
+      activeElement = activeElement.root.activeElement;
+    return activeElement;
+  }
   // Older versions of IE throws unspecified error when touching
   // document.activeElement in some cases (during loading, in iframe)
   if (ie && ie_version < 11) activeElt = function() {
@@ -8371,7 +8524,7 b''
 
   // See if "".split is the broken IE version, if so, provide an
   // alternative way to split lines.
-  var splitLines = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
+  var splitLinesAuto = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
     var pos = 0, result = [], l = string.length;
     while (pos <= l) {
       var nl = string.indexOf("\n", pos);
@@ -8417,14 +8570,16 b''
 
   // KEY NAMES
 
-  var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
-                  19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
-                  36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
-                  46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod", 107: "=", 109: "-", 127: "Delete",
-                  173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
-                  221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
-                  63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"};
-  CodeMirror.keyNames = keyNames;
+  var keyNames = CodeMirror.keyNames = {
+    3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
+    19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
+    36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
+    46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
+    106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete",
+    173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
+    221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
+    63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
+  };
   (function() {
     // Number keys
     for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i);
@@ -8729,7 +8884,7 b''
 
   // THE END
 
-  CodeMirror.version = "5.4.0";
+  CodeMirror.version = "5.11.0";
 
   return CodeMirror;
 });

rhodecode/public/js/src/codemirror/codemirror_hint.js

@@ -25,8 +25,18 b''
   };
 
   CodeMirror.defineExtension("showHint", function(options) {
-    // We want a single cursor position.
-    if (this.listSelections().length > 1 || this.somethingSelected()) return;
+    options = parseOptions(this, this.getCursor("start"), options);
+    var selections = this.listSelections()
+    if (selections.length > 1) return;
+    // By default, don't allow completion when something is selected.
+    // A hint function can have a `supportsSelection` property to
+    // indicate that it can handle selections.
+    if (this.somethingSelected()) {
+      if (!options.hint.supportsSelection) return;
+      // Don't try with cross-line selections
+      for (var i = 0; i < selections.length; i++)
+        if (selections[i].head.line != selections[i].anchor.line) return;
+    }
 
     if (this.state.completionActive) this.state.completionActive.close();
     var completion = this.state.completionActive = new Completion(this, options);
@@ -38,12 +48,12 b''
 
   function Completion(cm, options) {
     this.cm = cm;
-    this.options = this.buildOptions(options);
+    this.options = options;
     this.widget = null;
     this.debounce = 0;
     this.tick = 0;
-    this.startPos = this.cm.getCursor();
-    this.startLen = this.cm.getLine(this.startPos.line).length;
+    this.startPos = this.cm.getCursor("start");
+    this.startLen = this.cm.getLine(this.startPos.line).length - this.cm.getSelection().length;
 
     var self = this;
     cm.on("cursorActivity", this.activityFunc = function() { self.cursorActivity(); });
@@ -99,7 +109,6 b''
 
     update: function(first) {
       if (this.tick == null) return;
-      if (this.data) CodeMirror.signal(this.data, "update");
       if (!this.options.hint.async) {
         this.finishUpdate(this.options.hint(this.cm, this.options), first);
       } else {
@@ -111,6 +120,8 b''
     },
 
     finishUpdate: function(data, first) {
+      if (this.data) CodeMirror.signal(this.data, "update");
+      if (data && this.data && CodeMirror.cmpPos(data.from, this.data.from)) data = null;
       this.data = data;
 
       var picked = (this.widget && this.widget.picked) || (first && this.options.completeSingle);
@@ -123,20 +134,21 b''
           CodeMirror.signal(data, "shown");
         }
       }
-    },
-
-    buildOptions: function(options) {
-      var editor = this.cm.options.hintOptions;
-      var out = {};
-      for (var prop in defaultOptions) out[prop] = defaultOptions[prop];
-      if (editor) for (var prop in editor)
-        if (editor[prop] !== undefined) out[prop] = editor[prop];
-      if (options) for (var prop in options)
-        if (options[prop] !== undefined) out[prop] = options[prop];
-      return out;
     }
   };
 
+  function parseOptions(cm, pos, options) {
+    var editor = cm.options.hintOptions;
+    var out = {};
+    for (var prop in defaultOptions) out[prop] = defaultOptions[prop];
+    if (editor) for (var prop in editor)
+      if (editor[prop] !== undefined) out[prop] = editor[prop];
+    if (options) for (var prop in options)
+      if (options[prop] !== undefined) out[prop] = options[prop];
+    if (out.hint.resolve) out.hint = out.hint.resolve(cm, pos)
+    return out;
+  }
+
   function getText(completion) {
     if (typeof completion == "string") return completion;
     else return completion.text;
@@ -335,34 +347,79 b''
     }
   };
 
-  CodeMirror.registerHelper("hint", "auto", function(cm, options) {
-    var helpers = cm.getHelpers(cm.getCursor(), "hint"), words;
+  function applicableHelpers(cm, helpers) {
+    if (!cm.somethingSelected()) return helpers
+    var result = []
+    for (var i = 0; i < helpers.length; i++)
+      if (helpers[i].supportsSelection) result.push(helpers[i])
+    return result
+  }
+
+  function resolveAutoHints(cm, pos) {
+    var helpers = cm.getHelpers(pos, "hint"), words
     if (helpers.length) {
-      for (var i = 0; i < helpers.length; i++) {
-        var cur = helpers[i](cm, options);
-        if (cur && cur.list.length) return cur;
+      var async = false, resolved
+      for (var i = 0; i < helpers.length; i++) if (helpers[i].async) async = true
+      if (async) {
+        resolved = function(cm, callback, options) {
+          var app = applicableHelpers(cm, helpers)
+          function run(i, result) {
+            if (i == app.length) return callback(null)
+            var helper = app[i]
+            if (helper.async) {
+              helper(cm, function(result) {
+                if (result) callback(result)
+                else run(i + 1)
+              }, options)
+            } else {
+              var result = helper(cm, options)
+              if (result) callback(result)
+              else run(i + 1)
+            }
+          }
+          run(0)
+        }
+        resolved.async = true
+      } else {
+        resolved = function(cm, options) {
+          var app = applicableHelpers(cm, helpers)
+          for (var i = 0; i < app.length; i++) {
+            var cur = app[i](cm, options)
+            if (cur && cur.list.length) return cur
+          }
+        }
       }
+      resolved.supportsSelection = true
+      return resolved
     } else if (words = cm.getHelper(cm.getCursor(), "hintWords")) {
-      if (words) return CodeMirror.hint.fromList(cm, {words: words});
+      return function(cm) { return CodeMirror.hint.fromList(cm, {words: words}) }
     } else if (CodeMirror.hint.anyword) {
-      return CodeMirror.hint.anyword(cm, options);
+      return function(cm, options) { return CodeMirror.hint.anyword(cm, options) }
+    } else {
+      return function() {}
     }
+  }
+
+  CodeMirror.registerHelper("hint", "auto", {
+    resolve: resolveAutoHints
   });
 
   CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    var to = CodeMirror.Pos(cur.line, token.end);
+    if (token.string && /\w/.test(token.string[token.string.length - 1])) {
+      var term = token.string, from = CodeMirror.Pos(cur.line, token.start);
+    } else {
+      var term = "", from = to;
+    }
     var found = [];
     for (var i = 0; i < options.words.length; i++) {
       var word = options.words[i];
-      if (word.slice(0, token.string.length) == token.string)
+      if (word.slice(0, term.length) == term)
         found.push(word);
     }
 
-    if (found.length) return {
-      list: found,
-      from: CodeMirror.Pos(cur.line, token.start),
-            to: CodeMirror.Pos(cur.line, token.end)
-    };
+    if (found.length) return {list: found, from: from, to: to};
   });
 
   CodeMirror.commands.autocomplete = CodeMirror.showHint;
@@ -373,7 +430,7 b''
     alignWithWord: true,
     closeCharacters: /[\s()\[\]{};:>,]/,
     closeOnUnfocus: true,
-    completeOnSingleClick: false,
+    completeOnSingleClick: true,
     container: null,
     customKeys: null,
     extraKeys: null

rhodecode/public/js/src/codemirror/codemirror_placeholder.js

@@ -37,7 +37,9 b''
     var elt = cm.state.placeholder = document.createElement("pre");
     elt.style.cssText = "height: 0; overflow: visible";
     elt.className = "CodeMirror-placeholder";
-    elt.appendChild(document.createTextNode(cm.getOption("placeholder")));
+    var placeHolder = cm.getOption("placeholder")
+    if (typeof placeHolder == "string") placeHolder = document.createTextNode(placeHolder)
+    elt.appendChild(placeHolder)
     cm.display.lineSpace.insertBefore(elt, cm.display.lineSpace.firstChild);
   }
 

rhodecode/public/js/src/rhodecode.js

@@ -159,7 +159,7 b' var showRepoStats = function(target, dat'
             lnk = document.createElement('a');
 
             lnk.href = '#';
-            lnk.innerHTML = _ngettext('Show more');
+            lnk.innerHTML = _gettext('Show more');
             lnk.id = 'code_stats_show_more';
             td.appendChild(lnk);
 
@@ -223,7 +223,6 b' var formatSelect2SelectionRefs = functio'
 // takes a given html element and scrolls it down offset pixels
 function offsetScroll(element, offset){
     setTimeout(function(){
-        console.log(element);
         var location = element.offset().top;
         // some browsers use body, some use html
         $('html, body').animate({ scrollTop: (location - offset) });
@@ -249,21 +248,26 b' function offsetScroll(element, offset){'
             });
         }
     });
-    // Add tooltips
-    $('tr.line .lineno a').attr("title","Click to select line").addClass('tooltip');
-    $('tr.line .add-comment-line a').attr("title","Click to comment").addClass('tooltip');
+    $('.compare_view_files').on(
+        'mouseenter mouseleave', 'tr.line .lineno a',function(event) {
+            if (event.type === "mouseenter") {
+                $(this).parents('tr.line').addClass('hover');
+            } else {
+                $(this).parents('tr.line').removeClass('hover');
+            }
+        });
 
-    // Set colors and styles
-    $('tr.line .lineno a').hover(
-        function(){
-            $(this).parents('tr.line').addClass('hover');
-        }, function(){
-            $(this).parents('tr.line').removeClass('hover');
-        }
-    );
+    $('.compare_view_files').on(
+        'mouseenter mouseleave', 'tr.line .add-comment-line a',function(event){
+            if (event.type === "mouseenter") {
+                $(this).parents('tr.line').addClass('commenting');
+            } else {
+                $(this).parents('tr.line').removeClass('commenting');
+            }
+        });
 
-    $('tr.line .lineno a').click(
-        function(){
+    $('.compare_view_files').on(
+        'click', 'tr.line .lineno a',function(event) {
             if ($(this).text() != ""){
                 $('tr.line').removeClass('selected');
                 $(this).parents("tr.line").addClass('selected');
@@ -271,7 +275,7 b' function offsetScroll(element, offset){'
                 // Replace URL without jumping to it if browser supports.
                 // Default otherwise
                 if (history.pushState) {
-                    var new_location = location.href
+                    var new_location = location.href;
                     if (location.hash){
                         new_location = new_location.replace(location.hash, "");
                     }
@@ -283,23 +287,14 b' function offsetScroll(element, offset){'
                     return false;
                 }
             }
-        }
-    );
+        });
 
-    $('tr.line .add-comment-line a').hover(
-        function(){
-            $(this).parents('tr.line').addClass('commenting');
-        }, function(){
-            $(this).parents('tr.line').removeClass('commenting');
-        }
-    );
-
-    $('tr.line .add-comment-line a').on('click', function(e){
-        var tr = $(e.currentTarget).parents('tr.line')[0];
-        injectInlineForm(tr);
-        return false;
-    });
-
+    $('.compare_view_files').on(
+        'click', 'tr.line .add-comment-line a',function(event) {
+            var tr = $(event.currentTarget).parents('tr.line')[0];
+            injectInlineForm(tr);
+            return false;
+        });
 
     $('.collapse_file').on('click', function(e) {
         e.stopPropagation();
@@ -386,28 +381,14 b' function offsetScroll(element, offset){'
                 var tr = lineno.parents('tr.line');
                 tr.addClass('selected');
 
-                // once we scrolled into our line, trigger chat app
-                if (remainder){
-                    tr.find('.add-comment-line a').trigger( "click" );
-                    setTimeout(function(){
-                        var nextNode = $(tr).next();
-                        if(nextNode.hasClass('inline-comments')){
-                            nextNode.next().find('.switch-to-chat').trigger( "click" );
-                        }
-                        else{
-                            nextNode.find('.switch-to-chat').trigger( "click" );
-                        }
-                        // trigger scroll into, later so all elements are already loaded
-                        tr[0].scrollIntoView();
-                    }, 250);
+                tr[0].scrollIntoView();
 
-                }
-                else{
-                    tr[0].scrollIntoView();
-                }
+                $.Topic('/ui/plugins/code/anchor_focus').prepareOrPublish({
+                    tr:tr,
+                    remainder:remainder});
             }
         }
-    };
+    }
 
     collapsableContent();
 });

rhodecode/public/js/src/rhodecode/comments.js

@@ -150,19 +150,6 b' var injectInlineForm = function(tr){'
 
   var _form = $(f).find('.inline-form').get(0);
 
-  $('.switch-to-chat', _form).on('click', function(evt){
-    var fParent = $(_parent).closest('.injected_diff').parent().prev('*[fid]');
-    var fid = fParent.attr('fid');
-
-    // activate chat and trigger subscription to channels
-    $.Topic('/chat_controller').publish({
-      action:'subscribe_to_channels',
-      data: ['/chat${0}$/fid/{1}/{2}'.format(templateContext.repo_name, fid, lineno)]
-    });
-    $(_form).closest('td').find('.comment-inline-form').addClass('hidden');
-    $(_form).closest('td').find('.chat-holder').removeClass('hidden');
-  });
-
   var pullRequestId = templateContext.pull_request_data.pull_request_id;
   var commitId = templateContext.commit_data.commit_id;
 
@@ -205,7 +192,6 b' var injectInlineForm = function(tr){'
       // re trigger the linkification of next/prev navigation
       linkifyComments($('.inline-comment-injected'));
       timeagoActivate();
-      tooltip_activate();
       bindDeleteCommentButtons();
       commentForm.setActionButtonsDisabled(false);
 
@@ -224,6 +210,12 b' var injectInlineForm = function(tr){'
       }
   }, 10);
 
+    $.Topic('/ui/plugins/code/comment_form_built').prepareOrPublish({
+        form:_form,
+        parent:_parent,
+        lineno: lineno,
+        f_path: f_path}
+    );
 };
 
 var deleteComment = function(comment_id) {
@@ -545,7 +537,6 b' var CommentForm = (function() {'
                     self.resetCommentFormState();
                     bindDeleteCommentButtons();
                     timeagoActivate();
-                    tooltip_activate();
                 }
             };
             var submitFailCallback = function(){

rhodecode/public/js/src/rhodecode/tooltips.js

@@ -26,10 +26,10 b' TTIP.main = {'
     offset:     [15,15],
     maxWidth:   600,
 
-    set_listeners: function(tt){
-        $(tt).mouseover(tt, yt.show_tip);
-        $(tt).mousemove(tt, yt.move_tip);
-        $(tt).mouseout(tt, yt.close_tip);
+    setDeferredListeners: function(){
+        $('body').on('mouseover', '.tooltip', yt.show_tip);
+        $('body').on('mousemove', '.tooltip', yt.move_tip);
+        $('body').on('mouseout', '.tooltip', yt.close_tip);
     },
 
     init: function(){
@@ -43,19 +43,13 b' TTIP.main = {'
         if(yt.maxWidth !== null){
           $(yt.tipBox).css('max-width', yt.maxWidth+'px');
         }
-
-        var tooltips = $('.tooltip');
-        var ttLen = tooltips.length;
-
-        for(i=0;i<ttLen;i++){
-            yt.set_listeners(tooltips[i]);
-        }
+        yt.setDeferredListeners();
     },
 
     show_tip: function(e, el){
         e.stopPropagation();
         e.preventDefault();
-        var el = e.data || el;
+        var el = e.data || e.currentTarget || el;
         if(el.tagName.toLowerCase() === 'img'){
             yt.tipText = el.alt ? el.alt : '';
         } else {
@@ -76,7 +70,7 b' TTIP.main = {'
     move_tip: function(e, el){
         e.stopPropagation();
         e.preventDefault();
-        var el = e.data || el;
+        var el = e.data || e.currentTarget || el;
         var movePos = [e.pageX, e.pageY];
         $(yt.tipBox).css('top', (movePos[1] + yt.offset[1]) + 'px')
         $(yt.tipBox).css('left', (movePos[0] + yt.offset[0]) + 'px')
@@ -85,42 +79,16 b' TTIP.main = {'
     close_tip: function(e, el){
         e.stopPropagation();
         e.preventDefault();
-        var el = e.data || el;
+        var el = e.data || e.currentTarget || el;
         $(yt.tipBox).hide();
         $(el).attr('title', $(el).attr('tt_title'));
         $('#tip-box').hide();
     }
 };
 
-/**
- * tooltip activate
- */
-var tooltip_activate = function(){
-    yt = TTIP.main;
+// activate tooltips
+yt = TTIP.main;
+if ($(document).data('activated-tooltips') !== '1'){
     $(document).ready(yt.init);
-};
-
-/**
- * show changeset tooltip
- */
-var show_changeset_tooltip = function(){
-    $('.lazy-cs').mouseover(function(e) {
-        var target = e.currentTarget;
-        var rid = $(target).attr('raw_id');
-        var repo_name = $(target).attr('repo_name');
-        var ttid = 'tt-'+rid;
-        var success = function(o){
-            $(target).addClass('tooltip')
-            $(target).attr('title', o['message']);
-            TTIP.main.show_tip(e, target);
-        }
-        if(rid && !$(target).hasClass('tooltip')){
-            $(target).attr('id', ttid);
-            $(target).attr('title', _gettext('loading ...'));
-            TTIP.main.set_listeners(target);
-            TTIP.main.show_tip(e, target);
-            var url = pyroutes.url('changeset_info', {"repo_name":repo_name, "revision": rid});
-            ajaxGET(url, success);
-        }
-    });
-};
+    $(document).data('activated-tooltips', '1');
+}

rhodecode/public/js/src/rhodecode/utils/pyroutes.js

@@ -47,7 +47,7 b' var pyroutes = (function() {'
       }
       return str_format.format.call(null, str_format.cache[arguments[0]], arguments);
     };
-  
+
     str_format.format = function(parse_tree, argv) {
       var cursor = 1,
                    tree_length = parse_tree.length,
@@ -81,7 +81,7 b' var pyroutes = (function() {'
           else { // positional argument (implicit)
               arg = argv[cursor++];
           }
-      
+
           if (/[^s]/.test(match[8]) && (get_type(arg) !== 'number')) {
               throw(sprintf('[sprintf] expecting number but found %s', get_type(arg)));
           }
@@ -108,9 +108,9 b' var pyroutes = (function() {'
       }
       return output.join('');
     };
-  
+
     str_format.cache = {};
-  
+
     str_format.parse = function(fmt) {
     var _fmt = fmt, match = [], parse_tree = [], arg_names = 0;
     while (_fmt) {
@@ -161,12 +161,20 b' var pyroutes = (function() {'
     };
     return str_format;
   })();
-  
+
   var vsprintf = function(fmt, argv) {
     argv.unshift(fmt);
     return sprintf.apply(null, argv);
   };
   return {
+    'asset': function(path, ver) {
+      var asset_url = ASSET_URL || '/_static/rhodecode/';
+      var ret = asset_url + path;
+      if (ver !== undefined) {
+        ret += '?ver=' + ver;
+      }
+      return ret;
+    },
     'url': function(route_name, params) {
       var result = route_name;
       if (typeof(params) !== 'object'){
@@ -179,18 +187,18 b' var pyroutes = (function() {'
             var param_name = route[1][i];
             if (!params.hasOwnProperty(param_name))
                 throw new Error(
-                    'parameter '+ 
-                    param_name + 
-                    ' is missing in route"' + 
+                    'parameter '+
+                    param_name +
+                    ' is missing in route"' +
                     route_name + '" generation');
         }
         result = sprintf(route[0], params);
-  
+
         var ret = [];
         // extra params => GET
         for (var param in params){
             if (route[1].indexOf(param) === -1){
-                ret.push(encodeURIComponent(param) + "=" + 
+                ret.push(encodeURIComponent(param) + "=" +
                 encodeURIComponent(params[param]));
             }
         }
@@ -202,7 +210,7 b' var pyroutes = (function() {'
             result = APPLICATION_URL + result;
         }
       }
-  
+
       return result;
     },
     'register': function(route_name, route_tmpl, req_params) {

rhodecode/subscribers.py

@@ -53,3 +53,18 b' def add_localizer(event):'
 
     request.localizer = localizer
     request.translate = auto_translate
+
+
+def scan_repositories_if_enabled(event):
+    """
+    This is subscribed to the `pyramid.events.ApplicationCreated` event. It
+    does a repository scan if enabled in the settings.
+    """
+    from rhodecode.model.scm import ScmModel
+    from rhodecode.lib.utils import repo2db_mapper, get_rhodecode_base_path
+    settings = event.app.registry.settings
+    vcs_server_enabled = settings['vcs.server.enable']
+    import_on_startup = settings['startup.import_repos']
+    if vcs_server_enabled and import_on_startup:
+        repositories = ScmModel().repo_scan(get_rhodecode_base_path())
+        repo2db_mapper(repositories, remove_obsolete=False)

rhodecode/templates/admin/admin_log.html

@@ -1,4 +1,6 b''
 ## -*- coding: utf-8 -*-
+<%namespace name="base" file="/base/base.html"/>
+
 %if c.users_log:
 <table class="rctable admin_log">
     <tr>
@@ -12,11 +14,11 b''
     %for cnt,l in enumerate(c.users_log):
     <tr class="parity${cnt%2}">
         <td class="td-user">
-        %if l.user is not None:
-          ${h.link_to(l.user.username,h.url('edit_user', user_id=l.user.user_id))}
-        %else:
-          ${l.username}
-        %endif
+            %if l.user is not None:
+              ${base.gravatar_with_user(l.user.email)}
+            %else:
+              ${l.username}
+            %endif
         </td>
         <td class="td-journalaction">${h.action_parser(l)[0]()}
             <div class="journal_action_params">
@@ -50,8 +52,6 b''
         //therefore the .one method
         $(document).on('pjax:complete',function(){
             show_more_event();
-            tooltip_activate();
-            show_changeset_tooltip();
         });
 
         $(document).pjax('#user_log .pager_link', '#user_log');

rhodecode/templates/admin/auth/plugin_settings.html

@@ -97,7 +97,6 b''
 
     </div>
   </div>
-</%def>
 
 ## TODO: Ugly hack to get ldap select elements to work.
 ##       Find a solution to integrate this nicely.
@@ -114,3 +113,4 b''
     $("#search_scope").select2(select2Options);
 });
 </script>
+</%def>

rhodecode/templates/admin/gists/edit.html

@@ -44,27 +44,31 b''
                     <label for='lifetime'>${_('Gist lifetime')}</label>
                     ${h.dropdownmenu('lifetime', '0', c.lifetime_options)}
 
-                    <label for='acl_level'>${_('Gist access level')}</label>
-                    ${h.dropdownmenu('acl_level', c.gist.acl_level, c.acl_options)}
+                    <label for='gist_acl_level'>${_('Gist access level')}</label>
+                    ${h.dropdownmenu('gist_acl_level', c.gist.acl_level, c.acl_options)}
                 </div>
             </div>
 
+            ## peppercorn schema
+            <input type="hidden" name="__start__" value="nodes:sequence"/>
             % for cnt, file in enumerate(c.files):
+                <input type="hidden" name="__start__" value="file:mapping"/>
                 <div id="codeblock" class="codeblock" >
                   <div class="code-header">
                     <div class="form">
                       <div class="fields">
-                        <input type="hidden" value="${file.path}" name="org_files">
-                        <input id="filename_${h.FID('f',file.path)}" name="files" size="30" type="text" value="${file.path}">
-                          ${h.dropdownmenu('mimetypes' ,'plain',[('plain',_('plain'))],enable_filter=True, id='mimetype_'+h.FID('f',file.path))}
+                        <input type="hidden" name="filename_org" value="${file.path}" >
+                        <input id="filename_${h.FID('f',file.path)}" name="filename" size="30" type="text" value="${file.path}">
+                          ${h.dropdownmenu('mimetype' ,'plain',[('plain',_('plain'))],enable_filter=True, id='mimetype_'+h.FID('f',file.path))}
                       </div>
                     </div>
                   </div>
                   <div class="editor_container">
                       <pre id="editor_pre"></pre>
-                      <textarea id="editor_${h.FID('f',file.path)}" name="contents" >${file.content}</textarea>
+                      <textarea id="editor_${h.FID('f',file.path)}" name="content" >${file.content}</textarea>
                   </div>
                 </div>
+                <input type="hidden" name="__end__" />
 
                 ## dynamic edit box.
                 <script type="text/javascript">
@@ -72,7 +76,7 b''
                     var myCodeMirror = initCodeMirror(
                             "editor_${h.FID('f',file.path)}", '');
 
-                    var modes_select = $('#mimetype_${h.FID('f',file.path)}');
+                    var modes_select = $("#mimetype_${h.FID('f',file.path)}");
                     fillCodeMirrorOptions(modes_select);
 
                     // try to detect the mode based on the file we edit
@@ -86,7 +90,7 b''
                         setCodeMirrorMode(myCodeMirror, detected_mode);
                     }
 
-                    var filename_selector = '#filename_${h.FID('f',file.path)}';
+                    var filename_selector = "#filename_${h.FID('f',file.path)}";
                     // on change of select field set mode
                     setCodeMirrorModeFromSelect(
                             modes_select, filename_selector, myCodeMirror, null);
@@ -96,8 +100,8 b''
                         modes_select, filename_selector, myCodeMirror, null);
                 });
                 </script>
-
             %endfor
+            <input type="hidden" name="__end__" />
 
             <div class="pull-right">
             ${h.submit('update',_('Update Gist'),class_="btn btn-success")}

rhodecode/templates/admin/gists/index.html

@@ -118,11 +118,11 b''
                   "sort": "expires"}, title: "${_("Expires")}", className: "td-exp" }
       ],
       language: {
-          paginate: DEFAULT_GRID_PAGINATION
+          paginate: DEFAULT_GRID_PAGINATION,
+          emptyTable: _gettext("No gists available yet.")
       },
       "initComplete": function( settings, json ) {
           timeagoActivate();
-          tooltip_activate();
           get_datatable_count();
       }
     });
@@ -130,7 +130,6 b''
     // update the counter when things change
     $('#gist_list_table').on('draw.dt', function() {
         timeagoActivate();
-        tooltip_activate();
         get_datatable_count();
     });
 

rhodecode/templates/admin/gists/new.html

@@ -39,7 +39,7 b''
                  ${h.dropdownmenu('lifetime', '', c.lifetime_options)}
 
                  <label for='acl_level'>${_('Gist access level')}</label>
-                 ${h.dropdownmenu('acl_level', '', c.acl_options)}
+                 ${h.dropdownmenu('gist_acl_level', '', c.acl_options)}
 
             </div>
             <div id="codeblock" class="codeblock">

rhodecode/templates/admin/my_account/my_account.html

@@ -39,6 +39,7 b''
           <li class="${'active' if c.active=='watched' else ''}"><a href="${h.url('my_account_watched')}">${_('Watched')}</a></li>
           <li class="${'active' if c.active=='pullrequests' else ''}"><a href="${h.url('my_account_pullrequests')}">${_('Pull Requests')}</a></li>
           <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('my_account_perms')}">${_('My Permissions')}</a></li>
+          <li class="${'active' if c.active=='my_notifications' else ''}"><a href="${h.url('my_account_notifications')}">${_('My Live Notifications')}</a></li>
         </ul>
     </div>
 

rhodecode/templates/admin/my_account/my_account_auth_tokens.html

@@ -5,7 +5,7 b''
   <div class="panel-body">
       <p>
          ${_('Built-in tokens can be used to authenticate with all possible options.')}<br/>
-         ${_('Each token can have a role. VCS tokens can be used together with the authtoken auth plugin for git/hg operations.')}
+         ${_('Each token can have a role. VCS tokens can be used together with the authtoken auth plugin for git/hg/svn operations.')}
       </p>
       <table class="rctable auth_tokens">
         <tr>

rhodecode/templates/admin/my_account/my_account_notifications.html

@@ -1,72 +1,56 b''
-<%namespace name="base" file="/base/base.html"/>
-
 <div class="panel panel-default">
   <div class="panel-heading">
-    <h3 class="panel-title">${_('Account Emails')}</h3>
+    <h3 class="panel-title">${_('Your live notification settings')}</h3>
   </div>
 
     <div class="panel-body">
-        <div class="emails_wrap">
-          <table class="rctable account_emails">
-            <tr>
-            <td class="td-user">
-                ${base.gravatar(c.user.email, 16)}
-                <span class="user email">${c.user.email}</span>
-            </td>
-            <td class="td-tags">
-                <span class="tag tag1">${_('Primary')}</span>
-            </td>
-            </tr>
-            %if c.user_email_map:
-                %for em in c.user_email_map:
-                  <tr>
-                    <td class="td-user">
-                        ${base.gravatar(em.email, 16)}
-                        <span class="user email">${em.email}</span>
-                    </td>
-                    <td class="td-action">
-                        ${h.secure_form(url('my_account_emails'),method='delete')}
-                            ${h.hidden('del_email_id',em.email_id)}
-                            <button class="btn btn-link btn-danger" type="submit" id="remove_email_%s" % em.email_id
-                                    onclick="return confirm('${_('Confirm to delete this email: %s') % em.email}');">
-                                ${_('Delete')}
-                            </button>
-                        ${h.end_form()}
-                    </td>
-                  </tr>
-                %endfor
-            %else:
-                <tr class="noborder">
-                    <td colspan="3">
-                        <div class="td-email">
-                            ${_('No additional emails specified')}
-                        </div>
-                    </td>
-                </tr>
-            %endif
-          </table>
-        </div>
+
+        <p><strong>IMPORTANT:</strong> This feature requires enabled channelstream websocket server to function correctly.</p>
+
+        <p class="hidden">Status of browser notifications permission: <strong id="browser-notification-status"></strong></p>
 
-        <div>
-            ${h.secure_form(url('my_account_emails'), method='post')}
-            <div class="form">
-                <!-- fields -->
-                <div class="fields">
-                     <div class="field">
-                        <div class="label">
-                            <label for="new_email">${_('New email address')}:</label>
-                        </div>
-                        <div class="input">
-                            ${h.text('new_email', class_='medium')}
-                        </div>
-                     </div>
-                    <div class="buttons">
-                      ${h.submit('save',_('Add'),class_="btn")}
-                      ${h.reset('reset',_('Reset'),class_="btn")}
-                    </div>
-                </div>
-            </div>
+            ${h.secure_form(url('my_account_notifications_toggle_visibility'), method='post', id='notification-status')}
+            <button class="btn btn-default" type="submit">
+                ${_('Notifications')} <strong>${_('Enabled') if c.rhodecode_user.get_instance().user_data.get('notification_status') else _('Disabled')}</strong>
+            </button>
             ${h.end_form()}
-        </div>
+
+        <a class="btn btn-info" id="test-notification">Test notification</a>
+
     </div>
 </div>
+
+<script type="application/javascript">
+
+    function checkBrowserStatus(){
+        var browserStatus = 'Unknown';
+
+        if (!("Notification" in window)) {
+            browserStatus = 'Not supported'
+        }
+        else if(Notification.permission === 'denied'){
+            browserStatus = 'Denied';
+            $('.flash_msg').append('<div class="alert alert-error">Notifications are blocked on browser level - you need to enable them in your browser settings.</div>')
+        }
+        else if(Notification.permission === 'granted'){
+            browserStatus = 'Allowed';
+        }
+
+        $('#browser-notification-status').text(browserStatus);
+    };
+
+    checkBrowserStatus();
+
+$('#test-notification').on('click', function(e){
+    var levels = ['info', 'error', 'warning', 'success'];
+    var level = levels[Math.floor(Math.random()*levels.length)];
+    var payload = {
+        message: {
+            message: 'This is a test notification.',
+            level: level,
+            testMessage: true
+        }
+    };
+    $.Topic('/notifications').publish(payload);
+})
+</script>

rhodecode/templates/admin/my_account/my_account_pullrequests.html

@@ -32,8 +32,10 b''
               <td class="td-status">
                 <div class="${'flag_status %s' % pull_request.calculated_review_status()} pull-left"></div>
               </td>
-              <td class="td-componentname">
-                ${h.link_to(pull_request.target_repo.repo_name,h.url('summary_home',repo_name=pull_request.target_repo.repo_name))}
+              <td class="truncate-wrap td-componentname">
+                <div class="truncate">
+                  ${h.link_to(pull_request.target_repo.repo_name,h.url('summary_home',repo_name=pull_request.target_repo.repo_name))}
+                </div>
               </td>
               <td class="user">
                 ${base.gravatar_with_user(pull_request.author.email, 16)}
@@ -94,8 +96,10 b''
               <td class="td-status">
                 <div class="${'flag_status %s' % pull_request.calculated_review_status()} pull-left"></div>
               </td>
-              <td class="td-componentname">
-                ${h.link_to(pull_request.target_repo.repo_name,h.url('summary_home',repo_name=pull_request.target_repo.repo_name))}
+              <td class="truncate-wrap td-componentname">
+                <div class="truncate">
+                  ${h.link_to(pull_request.target_repo.repo_name,h.url('summary_home',repo_name=pull_request.target_repo.repo_name))}
+                </div>
               </td>
               <td class="user">
                 ${base.gravatar_with_user(pull_request.author.email, 16)}

rhodecode/templates/admin/my_account/my_account_repos.html

@@ -37,11 +37,11 b''
                   "sort": "action"}, title: "${_('Action')}", className: "td-action" }
       ],
       language: {
-          paginate: DEFAULT_GRID_PAGINATION
+          paginate: DEFAULT_GRID_PAGINATION,
+          emptyTable: _gettext("No repositories available yet.")
       },
       "initComplete": function( settings, json ) {
           get_datatable_count();
-          tooltip_activate();
           quick_repo_menu();
       }
     });

rhodecode/templates/admin/my_account/my_account_watched.html

@@ -35,11 +35,11 b''
                   "type": Number}, title: "${_('Commit')}", className: "td-hash" }
       ],
       language: {
-          paginate: DEFAULT_GRID_PAGINATION
+          paginate: DEFAULT_GRID_PAGINATION,
+          emptyTable: _gettext("No repositories available yet.")
       },
       "initComplete": function( settings, json ) {
           get_datatable_count();
-          tooltip_activate();
           quick_repo_menu();
       }
     });

rhodecode/templates/admin/repo_groups/repo_groups.html

@@ -62,11 +62,11 b''
                   "sort": "action"}, title: "${_('Action')}", className: "td-action" }
       ],
       language: {
-          paginate: DEFAULT_GRID_PAGINATION
+          paginate: DEFAULT_GRID_PAGINATION,
+          emptyTable: _gettext("No repository groups available yet.")
       },
       "initComplete": function( settings, json ) {
           get_datatable_count();
-          tooltip_activate();
           quick_repo_menu();
       }
     });

rhodecode/templates/admin/repos/repo_creating.html

@@ -38,7 +38,6 b''
         </div>
     </div>
 </div>
-</%def>
 
 <script>
 (function worker() {
@@ -72,3 +71,4 b''
   });
 })();
 </script>
+</%def>
  No newline at end of file

rhodecode/templates/admin/repos/repo_edit.html

@@ -23,6 +23,10 b''
     ${self.repo_menu(active='options')}
 </%def>
 
+<%def name="main_content()">
+  <%include file="/admin/repos/repo_edit_${c.active}.html"/>
+</%def>
+
 
 <%def name="main()">
 <div class="box">
@@ -64,14 +68,17 b''
           <li class="${'active' if c.active=='statistics' else ''}">
               <a href="${h.url('edit_repo_statistics', repo_name=c.repo_name)}">${_('Statistics')}</a>
           </li>
+          <li class="${'active' if c.active=='integrations' else ''}">
+              <a href="${h.route_path('repo_integrations_home', repo_name=c.repo_name)}">${_('Integrations')}</a>
+          </li>
         </ul>
     </div>
 
     <div class="main-content-full-width">
-        <%include file="/admin/repos/repo_edit_${c.active}.html"/>
+      ${self.main_content()}
     </div>
 
   </div>
 </div>
 
-</%def>
+</%def>
  No newline at end of file

rhodecode/templates/admin/repos/repos.html

@@ -69,11 +69,11 b''
                   "sort": "action"}, title: "${_('Action')}", className: "td-action" }
       ],
       language: {
-          paginate: DEFAULT_GRID_PAGINATION
+          paginate: DEFAULT_GRID_PAGINATION,
+          emptyTable:_gettext("No repositories available yet.")
       },
       "initComplete": function( settings, json ) {
           get_datatable_count();
-          tooltip_activate();
           quick_repo_menu();
       }
     });

rhodecode/templates/admin/settings/settings.html

@@ -18,6 +18,18 b''
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="side_bar_nav()">
+  % for navitem in c.navlist:
+    <li class="${'active' if c.active==navitem.key else ''}">
+      <a href="${navitem.url}">${navitem.name}</a>
+    </li>
+  % endfor
+</%def>
+
+<%def name="main_content()">
+  <%include file="/admin/settings/settings_${c.active}.html"/>
+</%def>
+
 <%def name="main()">
 <div class="box">
     <div class="title">
@@ -28,18 +40,14 b''
     <div class='sidebar-col-wrapper'>
       <div class="sidebar">
           <ul class="nav nav-pills nav-stacked">
-            % for navitem in c.navlist:
-              <li class="${'active' if c.active==navitem.key else ''}">
-                <a href="${navitem.url}">${navitem.name}</a>
-              </li>
-            % endfor
+            ${self.side_bar_nav()}
           </ul>
       </div>
 
       <div class="main-content-full-width">
-          <%include file="/admin/settings/settings_${c.active}.html"/>
+        ${self.main_content()}
       </div>
     </div>
 </div>
 
-</%def>
+</%def>
  No newline at end of file

rhodecode/templates/admin/settings/settings_global.html

@@ -77,8 +77,8 b''
         <div style="padding: 10px 0px"></div>
         <div class="textarea text-area">
             ${h.textarea('rhodecode_pre_code',cols=23,rows=5,class_="medium")}
-            <span class="help-block">${_('Custom js/css code added at the end of the <header> tag.')}
-                         ${_('Use <script> or <css> tags to define custom styling or scripting')}</span>
+            <span class="help-block">${_('Custom js/css code added at the end of the <header/> tag.')}
+                         ${_('Use <script/> or <css/> tags to define custom styling or scripting')}</span>
         </div>
     </div>
 </div>

rhodecode/templates/admin/settings/settings_system.html

@@ -84,6 +84,6 b''
 <script>
     $('#check_for_update').click(function(e){
         $('#update_notice').show();
-        $('#update_notice').load("${h.url('admin_settings_system_update')}");
+        $('#update_notice').load("${h.url('admin_settings_system_update',version=c.rhodecode_version, platform=c.platform)}");
     })
 </script>

rhodecode/templates/admin/user_groups/user_groups.html

@@ -66,11 +66,11 b''
                   "sort": "action"}, title: "${_('Action')}", className: "td-action" }
       ],
       language: {
-          paginate: DEFAULT_GRID_PAGINATION
+          paginate: DEFAULT_GRID_PAGINATION,
+          emptyTable: _gettext("No user groups available yet.")
       },
       "initComplete": function( settings, json ) {
           get_datatable_count();
-          tooltip_activate();
       }
     });
 

rhodecode/templates/admin/users/users.html

@@ -84,7 +84,6 b''
       pageLength: ${c.visual.admin_grid_items},
       order: [[ 1, "asc" ]],
       columns: [
-         { data: {"_": "gravatar"}, className: "td-gravatar" },
          { data: {"_": "username",
                   "sort": "username_raw"}, title: "${_('Username')}", className: "td-user" },
          { data: {"_": "email",
@@ -106,11 +105,11 b''
                   "sort": "action"}, title: "${_('Action')}", className: "td-action" }
       ],
       language: {
-          paginate: DEFAULT_GRID_PAGINATION
+          paginate: DEFAULT_GRID_PAGINATION,
+          emptyTable: _gettext("No users available yet.")
       },
       "initComplete": function( settings, json ) {
           get_datatable_count();
-          tooltip_activate();
       },
       "createdRow": function ( row, data, index ) {
           if (!data['active_raw']){

rhodecode/templates/base/base.html

@@ -7,7 +7,7 b''
       <div id="header-inner" class="wrapper">
           <div id="logo">
               <div class="logo-wrapper">
-                  <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                  <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
               </div>
               %if c.rhodecode_name:
                <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
@@ -16,7 +16,6 b''
           <!-- MENU BAR NAV -->
           ${self.menu_bar_nav()}
           <!-- END MENU BAR NAV -->
-          ${self.body()}
       </div>
   </div>
   ${self.menu_bar_subnav()}
@@ -82,6 +81,7 b''
       <li><a href="${h.url('users_groups')}">${_('User groups')}</a></li>
       <li><a href="${h.url('admin_permissions_application')}">${_('Permissions')}</a></li>
       <li><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
+      <li><a href="${h.route_path('global_integrations_home')}">${_('Integrations')}</a></li>
       <li><a href="${h.url('admin_defaults_repositories')}">${_('Defaults')}</a></li>
       <li class="last"><a href="${h.url('admin_settings')}">${_('Settings')}</a></li>
   </ul>
@@ -135,8 +135,9 b''
 
 
 <%def name="gravatar_with_user(contact, size=16, show_disabled=False)">
-  <div class="rc-user tooltip" title="${contact}">
-    ${self.gravatar(h.email_or_none(contact), size)}
+  <% email = h.email_or_none(contact) %>
+  <div class="rc-user tooltip" title="${h.author_string(email)}">
+    ${self.gravatar(email, size)}
     <span class="${'user user-disabled' if show_disabled else 'user'}"> ${h.link_to_user(contact)}</span>
   </div>
 </%def>
@@ -579,7 +580,7 b''
         % endif
 
     </script>
-    <script src="${h.url('/js/rhodecode/base/keyboard-bindings.js', ver=c.rhodecode_version_hash)}"></script>
+    <script src="${h.asset('js/rhodecode/base/keyboard-bindings.js', ver=c.rhodecode_version_hash)}"></script>
 </%def>
 
 <div class="modal" id="help_kb" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">

rhodecode/templates/base/root.html

@@ -1,54 +1,20 b''
 ## -*- coding: utf-8 -*-
 <!DOCTYPE html>
 
-<%def name="get_template_context()" filter="n, trim">{
+<%
+c.template_context['repo_name'] = getattr(c, 'repo_name', '')
 
-    ## repo data
-    repo_name: "${getattr(c, 'repo_name', '')}",
-    % if hasattr(c, 'rhodecode_db_repo'):
-    repo_type: "${c.rhodecode_db_repo.repo_type}",
-    repo_landing_commit: "${c.rhodecode_db_repo.landing_rev[1]}",
-    % else:
-    repo_type: null,
-    repo_landing_commit: null,
-    % endif
+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]
 
-    ## user data
-    % if getattr(c, 'rhodecode_user', None) and c.rhodecode_user.user_id:
-    rhodecode_user: {
-        username: "${c.rhodecode_user.username}",
-        email: "${c.rhodecode_user.email}",
-    },
-    % else:
-    rhodecode_user: {
-        username: null,
-        email: null,
-    },
-    % endif
-
-    ## visual settings
-    visual: {
-        default_renderer: "${h.get_visual_attr(c, 'default_renderer')}"
-    },
+if getattr(c, 'rhodecode_user', None) and c.rhodecode_user.user_id:
+    c.template_context['rhodecode_user']['username'] = c.rhodecode_user.username
+    c.template_context['rhodecode_user']['email'] = c.rhodecode_user.email
+    c.template_context['rhodecode_user']['notification_status'] = c.rhodecode_user.get_instance().user_data.get('notification_status', True)
 
-    ## current commit context, filled inside templates that expose that
-    commit_data: {
-        commit_id: null,
-    },
-
-    ## current pr context, filled inside templates that expose that
-    pull_request_data: {
-        pull_request_id: null,
-    },
-
-    ## timeago settings, can be overwritten by custom user settings later
-    timeago: {
-        refresh_time: ${120 * 1000},
-        cutoff_limit: ${1000*60*60*24*7}
-    }
-}
-
-</%def>
+c.template_context['visual']['default_renderer'] = h.get_visual_attr(c, 'default_renderer')
+%>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
@@ -58,13 +24,13 b''
             <meta name="robots" content="index, nofollow"/>
         </%def>
         ${self.robots()}
-        <link rel="icon" href="${h.url('/images/favicon.ico', ver=c.rhodecode_version_hash)}" sizes="16x16 32x32" type="image/png" />
+        <link rel="icon" href="${h.asset('images/favicon.ico', ver=c.rhodecode_version_hash)}" sizes="16x16 32x32" type="image/png" />
 
         ## CSS definitions
         <%def name="css()">
-            <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css', ver=c.rhodecode_version_hash)}" media="screen"/>
+            <link rel="stylesheet" type="text/css" href="${h.asset('css/style.css', ver=c.rhodecode_version_hash)}" media="screen"/>
             <!--[if lt IE 9]>
-                <link rel="stylesheet" type="text/css" href="${h.url('/css/ie.css', ver=c.rhodecode_version_hash)}" media="screen"/>
+                <link rel="stylesheet" type="text/css" href="${h.asset('css/ie.css', ver=c.rhodecode_version_hash)}" media="screen"/>
             <![endif]-->
             ## EXTRA FOR CSS
             ${self.css_extra()}
@@ -77,10 +43,10 b''
 
         ## JAVASCRIPT
         <%def name="js()">
-            <script src="${h.url('/js/rhodecode/i18n/%s.js' % c.language, ver=c.rhodecode_version_hash)}"></script>
+            <script src="${h.asset('js/rhodecode/i18n/%s.js' % c.language, ver=c.rhodecode_version_hash)}"></script>
             <script type="text/javascript">
             // register templateContext to pass template variables to JS
-            var templateContext = ${get_template_context()};
+            var templateContext = ${h.json.dumps(c.template_context)|n};
 
             var REPO_NAME = "${getattr(c, 'repo_name', '')}";
             %if hasattr(c, 'rhodecode_db_repo'):
@@ -91,6 +57,7 b''
             var REPO_TYPE = '';
             %endif
             var APPLICATION_URL = "${h.url('home').rstrip('/')}";
+            var ASSET_URL = "${h.asset('')}";
             var DEFAULT_RENDERER = "${h.get_visual_attr(c, 'default_renderer')}";
             var CSRF_TOKEN = "${getattr(c, 'csrf_token', '')}";
             % if getattr(c, 'rhodecode_user', None):
@@ -102,7 +69,9 b''
             var APPENLIGHT = {
               enabled: ${'true' if getattr(c, 'appenlight_enabled', False) else 'false'},
               key: '${getattr(c, "appenlight_api_public_key", "")}',
-              serverUrl: '${getattr(c, "appenlight_server_url", "")}',
+              % if getattr(c, 'appenlight_server_url', None):
+                  serverUrl: '${getattr(c, "appenlight_server_url", "")}',
+              % endif
               requestInfo: {
               % if getattr(c, 'rhodecode_user', None):
                   ip: '${c.rhodecode_user.ip_addr}',
@@ -111,22 +80,21 b''
               }
             };
             </script>
-
             <!--[if lt IE 9]>
-            <script language="javascript" type="text/javascript" src="${h.url('/js/excanvas.min.js')}"></script>
+            <script language="javascript" type="text/javascript" src="${h.asset('js/excanvas.min.js')}"></script>
             <![endif]-->
-            <script language="javascript" type="text/javascript" src="${h.url('/js/rhodecode/routes.js', ver=c.rhodecode_version_hash)}"></script>
-            <script language="javascript" type="text/javascript" src="${h.url('/js/scripts.js', ver=c.rhodecode_version_hash)}"></script>
-            <script>CodeMirror.modeURL = "${h.url('/js/mode/%N/%N.js')}";</script>
+            <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode/routes.js', ver=c.rhodecode_version_hash)}"></script>
+            <script language="javascript" type="text/javascript" src="${h.asset('js/scripts.js', ver=c.rhodecode_version_hash)}"></script>
+            ## avoide escaping the %N
+            <script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
+
 
             ## JAVASCRIPT EXTRA - optionally inject some extra JS for specificed templates
             ${self.js_extra()}
 
             <script type="text/javascript">
             $(document).ready(function(){
-              tooltip_activate();
               show_more_event();
-              show_changeset_tooltip();
               timeagoActivate();
             })
             </script>
@@ -139,6 +107,7 b''
 
         <%def name="head_extra()"></%def>
         ${self.head_extra()}
+        <%include file="/base/plugins_base.html"/>
 
         ## extra stuff
         %if c.pre_code:

rhodecode/templates/base/vcs_settings.html

@@ -213,4 +213,32 b''
             </div>
         </div>
     % endif
+
+    ## This condition has to be adapted if we add more labs settings for
+    ## VCS types other than 'hg'
+    % if c.labs_active and (display_globals or repo_type in ['hg']):
+        <div class="panel panel-danger">
+            <div class="panel-heading">
+                <h3 class="panel-title">${_('Labs settings')}: ${_('These features are considered experimental and may not work as expected.')}</h3>
+            </div>
+            <div class="panel-body">
+              <div class="fields">
+
+                <div class="field">
+                  <div class="label">
+                    <label>${_('Mercurial server-side merge')}:</label>
+                  </div>
+                  <div class="checkboxes">
+                    <div class="checkbox">
+                      ${h.checkbox('rhodecode_hg_use_rebase_for_merging' + suffix, 'True', **kwargs)}
+                      <label for="rhodecode_hg_use_rebase_for_merging${suffix}">${_('Use rebase instead of creating a merge commit when merging via web interface')}</label>
+                    </div>
+                    <!-- <p class="help-block">Help message here</p> -->
+                  </div>
+                </div>
+
+              </div>
+            </div>
+        </div>
+    % endif
 </%def>

rhodecode/templates/bookmarks/bookmarks.html

@@ -68,11 +68,11 b''
                   "sort": "compare"}, title: "${_('Compare')}", className: "td-compare" }
       ],
       language: {
-            paginate: DEFAULT_GRID_PAGINATION
+            paginate: DEFAULT_GRID_PAGINATION,
+            emptyTable: _gettext("No bookmarks available yet.")
       },
       "initComplete": function(settings, json) {
           get_datatable_count();
-          tooltip_activate();
           timeagoActivate();
           compare_radio_buttons("${c.repo_name}", 'book');
       }
@@ -81,7 +81,6 b''
     // update when things change
     $('#obj_list_table').on('draw.dt', function() {
         get_datatable_count();
-        tooltip_activate();
         timeagoActivate();
     });
 

rhodecode/templates/branches/branches.html

@@ -67,11 +67,11 b''
                   "sort": "compare"}, title: "${_('Compare')}", className: "td-compare" }
       ],
       language: {
-            paginate: DEFAULT_GRID_PAGINATION
+            paginate: DEFAULT_GRID_PAGINATION,
+            emptyTable: _gettext("No branches available yet.")
       },
       "initComplete": function( settings, json ) {
           get_datatable_count();
-          tooltip_activate();
           timeagoActivate();
           compare_radio_buttons("${c.repo_name}", 'branch');
       }
@@ -80,7 +80,6 b''
     // update when things change
     $('#obj_list_table').on('draw.dt', function() {
         get_datatable_count();
-        tooltip_activate();
         timeagoActivate();
     });
 

rhodecode/templates/changelog/changelog.html

@@ -97,14 +97,18 b''
           <div class="table">
             <table id="changesets" class="rctable">
                 <tr>
-                  <th></th>
+                  ## checkbox
                   <th></th>
-                  <th>${_('Author')}</th>
-                  <th>${_('Age')}</th>
+                  <th colspan="2"></th>
+
+                  <th>${_('Commit')}</th>
+                  ## commit message expand arrow
                   <th></th>
                   <th>${_('Commit Message')}</th>
-                  <th>${_('Commit')}</th>
-                  <th></th>
+
+                  <th>${_('Age')}</th>
+                  <th>${_('Author')}</th>
+
                   <th>${_('Refs')}</th>
                 </tr>
               <tbody>
@@ -128,27 +132,17 b''
                           </a>
                         %endif
                       </div>
+                    %else:
+                        <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div>
                     %endif
                     </td>
-                    <td class="td-user">
-                      ${self.gravatar(h.email_or_none(commit.author))}
-                      <span title="${commit.author}" class="user">${h.link_to_user(commit.author, length=22)}</span>
-                    </td>
-                    <td class="td-time">
-                        ${h.age_component(commit.date)}
+                    <td class="td-comments comments-col">
+                    %if c.comments.get(commit.raw_id):
+                      <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id,anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
+                          <i class="icon-comment icon-comment-colored"></i> ${len(c.comments[commit.raw_id])}
+                      </a>
+                    %endif
                     </td>
-
-                    <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}">
-                      <div class="show_more_col">
-                        <i class="show_more"></i>&nbsp;
-                      </div>
-                    </td>
-                    <td class="mid td-description">
-                      <div class="log-container truncate-wrap">
-                          <div class="message truncate" id="c-${commit.raw_id}">${h.urlify_commit_message(commit.message, c.repo_name)}</div>
-                      </div>
-                      </td>
-
                     <td class="td-hash">
                     <code>
                       <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id)}">
@@ -156,13 +150,22 b''
                       </a>
                     </code>
                     </td>
+                    <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}">
+                      <div class="show_more_col">
+                        <i class="show_more"></i>&nbsp;
+                      </div>
+                    </td>
+                    <td class="td-description mid">
+                      <div class="log-container truncate-wrap">
+                          <div class="message truncate" id="c-${commit.raw_id}">${h.urlify_commit_message(commit.message, c.repo_name)}</div>
+                      </div>
+                    </td>
 
-                    <td class="td-comments comments-col">
-                    %if c.comments.get(commit.raw_id):
-                      <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id,anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
-                          ${len(c.comments[commit.raw_id])} <i class="icon-comment icon-comment-colored"></i>
-                      </a>
-                    %endif
+                    <td class="td-time">
+                        ${h.age_component(commit.date)}
+                    </td>
+                    <td class="td-user">
+                        ${self.gravatar_with_user(commit.author)}
                     </td>
 
                     <td class="td-tags tags-col truncate-wrap">
@@ -203,7 +206,7 b''
         ${c.pagination.pager('$link_previous ~2~ $link_next')}
     </div>
 
-    <script type="text/javascript" src="${h.url('/js/jquery.commits-graph.js')}"></script>
+    <script type="text/javascript" src="${h.asset('js/jquery.commits-graph.js')}"></script>
     <script type="text/javascript">
         var cache = {};
         $(function(){

rhodecode/templates/changelog/changelog_summary_data.html

@@ -3,8 +3,9 b''
 %if c.repo_commits:
 <table class="rctable repo_summary table_disp">
     <tr>
+
+        <th class="status" colspan="2"></th>
         <th>${_('Commit')}</th>
-        <th class="status" colspan="2"></th>
         <th>${_('Commit message')}</th>
         <th>${_('Age')}</th>
         <th>${_('Author')}</th>
@@ -12,40 +13,48 b''
     </tr>
 %for cnt,cs in enumerate(c.repo_commits):
     <tr class="parity${cnt%2}">
+
+        <td class="td-status">
+            %if c.statuses.get(cs.raw_id):
+                <div class="changeset-status-ico shortlog">
+                    %if c.statuses.get(cs.raw_id)[2]:
+                    <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
+                        <div class="${'flag_status %s' % c.statuses.get(cs.raw_id)[0]}"></div>
+                    </a>
+                    %else:
+                    <a class="tooltip" title="${_('Commit status: %s') % h.commit_status_lbl(c.statuses.get(cs.raw_id)[0])}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
+                        <div class="${'flag_status %s' % c.statuses.get(cs.raw_id)[0]}"></div>
+                    </a>
+                    %endif
+                </div>
+            %else:
+                <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div>
+            %endif
+        </td>
+        <td class="td-comments">
+            %if c.comments.get(cs.raw_id,[]):
+            <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
+                <i class="icon-comment icon-comment-colored"></i> ${len(c.comments[cs.raw_id])}
+            </a>
+            %endif
+        </td>
         <td class="td-commit">
             <pre><a href="${h.url('changeset_home', repo_name=c.repo_name, revision=cs.raw_id)}">${h.show_id(cs)}</a></pre>
         </td>
-        <td class="td-status">
-              %if c.statuses.get(cs.raw_id):
-                <div class="changeset-status-ico shortlog">
-                %if c.statuses.get(cs.raw_id)[2]:
-                  <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
-                    <div class="${'flag_status %s' % c.statuses.get(cs.raw_id)[0]}"></div>
-                  </a>
-                %else:
-                  <div class="${'flag_status %s' % c.statuses.get(cs.raw_id)[0]}"></div>
-                %endif
-                </div>
-              %endif
-          </td>
-          <td class="td-comments">
-              %if c.comments.get(cs.raw_id,[]):
-                 <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
-                     <i class="icon-comment icon-comment-colored"></i> ${len(c.comments[cs.raw_id])}
-                  </a>
-              %endif
+
+        <td class="td-description mid">
+          <div class="log-container truncate-wrap">
+              <div class="message truncate" id="c-${cs.raw_id}">${h.urlify_commit_message(cs.message, c.repo_name)}</div>
+          </div>
         </td>
-        <td class="td-message">
-            ${h.urlify_commit_message(h.truncate(cs.message, 50), c.repo_name)}
-        </td>
+
         <td class="td-time">
             ${h.age_component(cs.date)}
         </td>
+        <td class="td-user author">
+            ${base.gravatar_with_user(cs.author)}
+        </td>
 
-        <td class="td-user author">
-              ${base.gravatar(h.email_or_none(cs.author), 16)}
-              <span title="${cs.author}" class="user">${h.link_to_user(cs.author, length=22)}</span>
-        </td>
         <td class="td-tags truncate-wrap">
           <div class="truncate tags-truncate"><div class="autoexpand">
             %if h.is_hg(c.rhodecode_repo):
@@ -77,7 +86,7 b''
 
 <script type="text/javascript">
   $(document).pjax('#shortlog_data .pager_link','#shortlog_data', {timeout: 2000, scrollTo: false });
-  $(document).on('pjax:success', function(){ timeagoActivate(); tooltip_activate(); });
+  $(document).on('pjax:success', function(){ timeagoActivate(); });
 </script>
 
 <div class="pagination-wh pagination-left">

rhodecode/templates/changeset/changeset.html

@@ -164,12 +164,10 b''
           ${_('Author')}
         </h4>
       </div>
-      <div class="sidebar-right-content">
-        <img alt="gravatar" class="gravatar" title="${h.email_or_none(c.commit.author)}" src="${h.gravatar_url(h.email_or_none(c.commit.author), 40)}" height="16" width="16">
-        <span class="author">
-            ${h.link_to_user(c.commit.author)} - ${h.age_component(c.commit.date)}
-        </span>
-      </div>
+        <div class="sidebar-right-content">
+            ${self.gravatar_with_user(c.commit.author)}
+            <div class="user-inline-data">- ${h.age_component(c.commit.date)}</div>
+        </div>
     </div><!-- end sidebar -->
   </div> <!-- end summary -->
   <div class="cs_files_title">

rhodecode/templates/data_table/_dt_elements.html

@@ -103,7 +103,9 b''
 </%def>
 
 <%def name="user_gravatar(email, size=16)">
+  <div class="rc-user tooltip" title="${h.author_string(email)}">
     ${base.gravatar(email, 16)}
+  </div>
 </%def>
 
 <%def name="repo_actions(repo_name, super_user=True)">

rhodecode/templates/debug_style/code-block.html

@@ -9,11 +9,11 b''
 </%def>
 
 <%def name="js_extra()">
-<script type="text/javascript" src="${h.url('/js/mergerly.js')}"></script>
+<script type="text/javascript" src="${h.asset('js/mergerly.js', ver=c.rhodecode_version_hash)}"></script>
 </%def>
 
 <%def name="css_extra()">
-<link rel="stylesheet" type="text/css" href="${h.url('/css/mergerly.css')}"/>
+<link rel="stylesheet" type="text/css" href="${h.asset('css/mergerly.css', ver=c.rhodecode_version_hash)}"/>
 </%def>
 
 

rhodecode/templates/debug_style/tables.html

@@ -351,9 +351,9 b''
             <td class="mid td-description">
                 <div class="log-container truncate-wrap">
                     <div id="c-2ffc6faabc7a9c790b1b452943a3f0c047b8b436" class="message truncate" data-message-raw="tests: Test echo method on the server object
-            
+
             This only works for Pyro4 so far, have to extend it still for HTTP to work.">tests: Test echo method on the server object
-            
+
             This only works for Pyro4 so far, have to extend it still for HTTP to work.</div>
                 </div>
             </td>
@@ -365,7 +365,7 b''
             $('.expand_commit').on('click',function(e){
               var target_expand = $(this);
               var cid = target_expand.data('commitId');
-            
+
               if (target_expand.hasClass('open')){
                 $('#c-'+cid).css({'height': '1.5em', 'white-space': 'nowrap', 'text-overflow': 'ellipsis', 'overflow':'hidden'});
                 $('#t-'+cid).css({'height': '1.5em', 'max-height': '1.5em', 'text-overflow': 'ellipsis', 'overflow':'hidden', 'white-space':'nowrap'});
@@ -507,7 +507,7 b''
           <td class="td-radio"><input type="radio" value="repository.admin"
             name="u_perm_1" id="u_perm_1_repositoryadmin"></td>
           <td>
-            <img class="gravatar" src="/images/user30.png" height="16" width="16">
+            <img class="gravatar" src="/_static/rhodecode/images/user30.png" height="16" width="16">
             <span class="user">default</span>
           </td>
           <td></td>

rhodecode/templates/email_templates/base.mako

@@ -1,17 +1,131 b''
 ## -*- coding: utf-8 -*-
 
+## helpers
+<%def name="tag_button(text, tag_type=None)">
+    <%
+    color_scheme = {
+        'default': 'border:1px solid #979797;color:#666666;background-color:#f9f9f9',
+        'approved': 'border:1px solid #0ac878;color:#0ac878;background-color:#f9f9f9',
+        'rejected': 'border:1px solid #e85e4d;color:#e85e4d;background-color:#f9f9f9',
+        'under_review': 'border:1px solid #ffc854;color:#ffc854;background-color:#f9f9f9',
+    }
+    %>
+    <pre style="display:inline;border-radius:2px;font-size:12px;padding:.2em;${color_scheme.get(tag_type, color_scheme['default'])}">${text}</pre>
+</%def>
+
+<%def name="status_text(text, tag_type=None)">
+    <%
+    color_scheme = {
+        'default': 'color:#666666',
+        'approved': 'color:#0ac878',
+        'rejected': 'color:#e85e4d',
+        'under_review': 'color:#ffc854',
+    }
+    %>
+    <span style="font-weight:bold;font-size:12px;padding:.2em;${color_scheme.get(tag_type, color_scheme['default'])}">${text}</span>
+</%def>
+
 ## headers we additionally can set for email
 <%def name="headers()" filter="n,trim"></%def>
 
-## plain text version of the email. Empty by default
-<%def name="body_plaintext()" filter="n,trim"></%def>
+<%def name="plaintext_footer()">
+${_('This is a notification from RhodeCode. %(instance_url)s') % {'instance_url': instance_url}}
+</%def>
+
+<%def name="body_plaintext()" filter="n,trim">
+## this example is not called itself but overridden in each template
+## the plaintext_footer should be at the bottom of both html and text emails
+${self.plaintext_footer()}
+</%def>
 
-${self.body()}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <title>${self.subject()}</title>
+    <style type="text/css">
+        /* Based on The MailChimp Reset INLINE: Yes. */  
+        #outlook a {padding:0;} /* Force Outlook to provide a "view in browser" menu link. */
+        body{width:100% !important; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; margin:0; padding:0;} 
+        /* Prevent Webkit and Windows Mobile platforms from changing default font sizes.*/ 
+        .ExternalClass {width:100%;} /* Force Hotmail to display emails at full width */  
+        .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;}
+        /* Forces Hotmail to display normal line spacing.  More on that: http://www.emailonacid.com/forum/viewthread/43/ */ 
+        #backgroundTable {margin:0; padding:0; line-height: 100% !important;}
+        /* End reset */
 
+        /* defaults for images*/
+        img {outline:none; text-decoration:none; -ms-interpolation-mode: bicubic;} 
+        a img {border:none;} 
+        .image_fix {display:block;}
+
+        body {line-height:1.2em;}
+        p {margin: 0 0 20px;}
+        h1, h2, h3, h4, h5, h6 {color:#323232!important;}
+        a {color:#427cc9;text-decoration:none;outline:none;cursor:pointer;}
+        a:focus {outline:none;}
+        a:hover {color: #305b91;}
+        h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {color:#427cc9!important;text-decoration:none!important;}
+        h1 a:active, h2 a:active,  h3 a:active, h4 a:active, h5 a:active, h6 a:active {color: #305b91!important;}
+        h1 a:visited, h2 a:visited,  h3 a:visited, h4 a:visited, h5 a:visited, h6 a:visited {color: #305b91!important;}
+        table {font-size:13px;border-collapse:collapse;mso-table-lspace:0pt;mso-table-rspace:0pt;}
+        table td {padding:.65em 1em .65em 0;border-collapse:collapse;vertical-align:top;text-align:left;}
+        input {display:inline;border-radius:2px;border-style:solid;border: 1px solid #dbd9da;padding:.5em;}
+        input:focus {outline: 1px solid #979797}
+        @media only screen and (-webkit-min-device-pixel-ratio: 2) {
+        /* Put your iPhone 4g styles in here */ 
+        }
 
-<div>
---
-<br/>
-<br/>
-<b>${_('This is a notification from RhodeCode. %(instance_url)s') % {'instance_url': instance_url}}</b>
-</div>
+        /* Android targeting */
+        @media only screen and (-webkit-device-pixel-ratio:.75){
+        /* Put CSS for low density (ldpi) Android layouts in here */
+        }
+        @media only screen and (-webkit-device-pixel-ratio:1){
+        /* Put CSS for medium density (mdpi) Android layouts in here */
+        }
+        @media only screen and (-webkit-device-pixel-ratio:1.5){
+        /* Put CSS for high density (hdpi) Android layouts in here */
+        }
+        /* end Android targeting */
+
+    </style>
+
+    <!-- Targeting Windows Mobile -->
+    <!--[if IEMobile 7]>
+    <style type="text/css">
+    
+    </style>
+    <![endif]-->
+
+    <!--[if gte mso 9]>
+        <style>
+        /* Target Outlook 2007 and 2010 */
+        </style>
+    <![endif]-->
+</head>
+<body>
+<!-- Wrapper/Container Table: Use a wrapper table to control the width and the background color consistently of your email. Use this approach instead of setting attributes on the body tag. -->
+<table cellpadding="0" cellspacing="0" border="0" id="backgroundTable" align="left" style="margin:1%;width:97%;padding:0;font-family:sans-serif;font-weight:100;border:1px solid #dbd9da">
+    <tr>
+        <td valign="top" style="padding:0;"> 
+            <table cellpadding="0" cellspacing="0" border="0" align="left" width="100%">
+                <tr><td style="width:100%;padding:7px;background-color:#202020" valign="top">
+                    <a style="color:#eeeeee;text-decoration:none;" href="${instance_url}">
+                        ${_('RhodeCode')}
+                        % if rhodecode_instance_name:
+                            - ${rhodecode_instance_name}
+                        % endif
+                    </a>
+                </td></tr>
+                <tr><td style="padding:15px;" valign="top">${self.body()}</td></tr>
+            </table>
+        </td>
+    </tr>
+</table>  
+<!-- End of wrapper table -->
+<p><a style="margin-top:15px;margin-left:1%;font-family:sans-serif;font-weight:100;font-size:11px;color:#666666;text-decoration:none;" href="${instance_url}">
+    ${self.plaintext_footer()}
+</a></p>
+</body>
+</html>

rhodecode/templates/email_templates/commit_comment.mako

@@ -1,14 +1,43 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
+<%namespace name="base" file="base.mako"/>
 
 <%def name="subject()" filter="n,trim">
-    ${_('[mention]') if mention else ''} ${_('%(user)s commented on commit of %(repo_name)s') % {
-                                         'user': h.person(user),
-                                         'repo_name': repo_name
-                                         } }
+<%
+data = {
+    'user': h.person(user),
+    'repo_name': repo_name,
+    'commit_id': h.show_id(commit),
+    'status': status_change,
+    'comment_file': comment_file,
+    'comment_line': comment_line,
+}
+%>
+${_('[mention]') if mention else ''} \
+
+% if comment_file:
+    ${_('%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)') % data} ${_('in the %(repo_name)s repository') % data |n}
+% else:
+    % if status_change:
+    ${_('%(user)s commented on commit `%(commit_id)s` (status: %(status)s)') % data |n} ${_('in the %(repo_name)s repository') % data |n}
+    % else:
+    ${_('%(user)s commented on commit `%(commit_id)s`') % data |n} ${_('in the %(repo_name)s repository') % data |n}
+    % endif
+% endif
+
 </%def>
 
 <%def name="body_plaintext()" filter="n,trim">
+<%
+data = {
+    'user': h.person(user),
+    'repo_name': repo_name,
+    'commit_id': h.show_id(commit),
+    'status': status_change,
+    'comment_file': comment_file,
+    'comment_line': comment_line,
+}
+%>
 ${self.subject()}
 
 * ${_('Comment link')}: ${commit_comment_url}
@@ -21,37 +50,39 b''
 
 ---
 
-${comment_body|n}
-
-
 %if status_change:
     ${_('Commit status was changed to')}: *${status_change}*
 %endif
 
+${comment_body|n}
+
+${self.plaintext_footer()}
 </%def>
 
 
-% if comment_file:
-    <h4>${_('%(user)s commented on a file in commit of %(repo_url)s.') % {'user': h.person(user), 'repo_url': commit_target_repo} |n}</h4>
-% else:
-    <h4>${_('%(user)s commented on a commit of %(repo_url)s.') % {'user': h.person(user), 'repo_url': commit_target_repo} |n}</h4>
-% endif
+<%
+data = {
+    'user': h.person(user),
+    'comment_file': comment_file,
+    'comment_line': comment_line,
+    'repo': commit_target_repo,
+    'repo_name': repo_name,
+    'commit_id': h.show_id(commit),
+}
+%>
+<table style="text-align:left;vertical-align:middle;">
+    <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
+    % if comment_file:
+        <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)') % data}</a> ${_('in the %(repo)s repository') % data |n}</h4>
+    % else:
+        <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s`') % data |n}</a> ${_('in the %(repo)s repository') % data |n}</h4>
+    % endif
+    </td></tr>
+    <tr><td style="padding-right:20px;padding-top:15px;">${_('Commit')}</td><td style="padding-top:15px;"><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${h.show_id(commit)}</a></td></tr>
+    <tr><td style="padding-right:20px;">${_('Description')}</td><td style="white-space:pre-wrap">${h.urlify_commit_message(commit.message, repo_name)}</td></tr>
 
-<ul>
-    <li>${_('Comment link')}: <a href="${commit_comment_url}">${commit_comment_url}</a></li>
-    %if comment_file:
-        <li>${_('File: %(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}</li>
-    %endif
-    <li>${_('Commit')}: ${h.show_id(commit)}</li>
-    <li>
-        ${_('Commit Description')}: <p>${h.urlify_commit_message(commit.message, repo_name)}</p>
-    </li>
-</ul>
-
-<hr>
-    <p>${h.render(comment_body, renderer=renderer_type, mentions=True)}</p>
-<hr/>
-
-%if status_change:
-    <p>${_('Commit status was changed to')}: <b>${status_change}</b></p>
-%endif
+    % if status_change:
+        <tr><td style="padding-right:20px;">${_('Status')}</td><td>${_('The commit status was changed to')}: ${base.status_text(status_change, tag_type=status_change_type)}</td></tr>
+    % endif
+    <tr><td style="padding-right:20px;">${(_('Comment on line: %(comment_line)s') if comment_file else _('Comment')) % data}</td><td style="line-height:1.2em;white-space:pre-wrap">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
+</table>

rhodecode/templates/email_templates/main.mako

@@ -8,9 +8,14 b''
 ## plain text version of the email. Empty by default
 <%def name="body_plaintext()" filter="n,trim">
 ${body}
+
+${self.plaintext_footer()}
 </%def>
 
 ## BODY GOES BELOW
-<div style="white-space: pre-wrap">
-${body_plaintext()}
-</div>
  No newline at end of file
+<table style="text-align:left;vertical-align:top;">
+    <tr><td style="padding-right:20px;padding-top:15px;white-space:pre-wrap">${body}</td></tr>
+</table
+<p><a style="margin-top:15px;margin-left:1%;font-family:sans-serif;font-weight:100;font-size:11px;display:block;color:#666666;text-decoration:none;" href="${instance_url}">
+    ${self.plaintext_footer()}
+</a></p>
  No newline at end of file

rhodecode/templates/email_templates/password_reset.mako

@@ -16,9 +16,16 b' There was a request to reset your passwo'
 You can continue, and generate new password by clicking following URL:
 ${password_reset_url}
 
+${self.plaintext_footer()}
 </%def>
 
 ## BODY GOES BELOW
-<div style="white-space: pre-wrap">
-${body_plaintext()}
-</div>
  No newline at end of file
+<p>
+Hello ${user.username},
+</p><p>
+There was a request to reset your password using the email address ${email} on ${h.format_date(date)}
+<br/>
+<strong>If you did not request a password reset, please contact your RhodeCode administrator.</strong>
+</p><p>
+<a href="${password_reset_url}">${_('Generate new password here')}.</a>
+</p>

rhodecode/templates/email_templates/password_reset_confirmation.mako

@@ -9,14 +9,22 b' Your new RhodeCode password'
 <%def name="body_plaintext()" filter="n,trim">
 Hi ${user.username},
 
-Below is your new access password for RhodeCode.
+There was a request to reset your password using the email address ${email} on ${h.format_date(date)}
+
+*If you didn't do this, please contact your RhodeCode administrator.*
 
-password: ${new_password}
+You can continue, and generate new password by clicking following URL:
+${password_reset_url}
 
-*If you didn't request a new password, please contact your RhodeCode administrator immediately.*
+${self.plaintext_footer()}
 </%def>
 
 ## BODY GOES BELOW
-<div style="white-space: pre-wrap">
-${body_plaintext()}
-</div>
  No newline at end of file
+<p>
+Hello ${user.username},
+</p><p>
+Below is your new access password for RhodeCode.
+<br/>
+<strong>If you didn't request a new password, please contact your RhodeCode administrator.</strong>
+</p>
+<p>password: <input value='${new_password}'/></p>

rhodecode/templates/email_templates/pull_request_comment.mako

@@ -1,15 +1,44 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
+<%namespace name="base" file="base.mako"/>
+
 
 <%def name="subject()" filter="n,trim">
-    ${_('[mention]') if mention else ''} ${_('%(user)s commented on pull request #%(pr_id)s: "%(pr_title)s"') % {
-                                         'user': h.person(user),
-                                         'pr_title': pull_request.title,
-                                         'pr_id': pull_request.pull_request_id
-                                         } |n}
+<%
+data = {
+    'user': h.person(user),
+    'pr_title': pull_request.title,
+    'pr_id': pull_request.pull_request_id,
+    'status': status_change,
+    'comment_file': comment_file,
+    'comment_line': comment_line,
+}
+%>
+
+${_('[mention]') if mention else ''} \
+
+% if comment_file:
+    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file: `%(comment_file)s`)') % data |n}
+% else:
+    % if status_change:
+    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (status: %(status)s)') % data |n}
+    % else:
+    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
+    % endif
+% endif
 </%def>
 
 <%def name="body_plaintext()" filter="n,trim">
+<%
+data = {
+    'user': h.person(user),
+    'pr_title': pull_request.title,
+    'pr_id': pull_request.pull_request_id,
+    'status': status_change,
+    'comment_file': comment_file,
+    'comment_line': comment_line,
+}
+%>
 ${self.subject()}
 
 * ${_('Comment link')}: ${pr_comment_url}
@@ -22,45 +51,48 b''
 
 ---
 
+%if status_change and not closing_pr:
+   ${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s*') % data}
+%elif status_change and closing_pr:
+   ${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*') % data}
+%endif
+
 ${comment_body|n}
 
-
-%if status_change and not closing_pr:
-   ${_('Pull request status was changed to')}: *${status_change}*
-%elif status_change and closing_pr:
-   ${_('Pull request was closed with status')}: *${status_change}*
-%endif
-
+${self.plaintext_footer()}
 </%def>
 
-% if comment_file:
-    <h4>${_('%(user)s commented on a file on pull request #%(pr_id)s: "%(pr_title)s".') % {
-            'user': h.person(user),
-            'pr_title': pull_request.title,
-            'pr_id': pull_request.pull_request_id
-    } |n}</h4>
-% else:
-    <h4>${_('%(user)s commented on a pull request #%(pr_id)s "%(pr_title)s".') % {
-            'user': h.person(user),
-            'pr_title': pull_request.title,
-            'pr_id': pull_request.pull_request_id
-    } |n}</h4>
-% endif
+
+<%
+data = {
+    'user': h.person(user),
+    'pr_title': pull_request.title,
+    'pr_id': pull_request.pull_request_id,
+    'status': status_change,
+    'comment_file': comment_file,
+    'comment_line': comment_line,
+}
+%>
+<table style="text-align:left;vertical-align:middle;">
+    <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
+    <h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">
 
-<ul>
-    <li>${_('Comment link')}: <a href="${pr_comment_url}">${pr_comment_url}</a></li>
-    <li>${_('Source repository')}: <a href="${pr_source_repo_url}">${pr_source_repo.repo_name}</a></li>
-    %if comment_file:
-        <li>${_('File: %(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}</li>
+    % if comment_file:
+        ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file:`%(comment_file)s`)') % data |n}
+    % else:
+        ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
+    % endif
+    </a>
+    %if status_change and not closing_pr:
+       , ${_('submitted pull request status: %(status)s') % data}
+    %elif status_change and closing_pr:
+       , ${_('submitted pull request status: %(status)s and closed') % data}
     %endif
-</ul>
-
-<hr>
-    <p>${h.render(comment_body, renderer=renderer_type, mentions=True)}</p>
-<hr/>
-
-%if status_change and not closing_pr:
-   <p>${_('Pull request status was changed to')}: <b>${status_change}</b></p>
-%elif status_change and closing_pr:
-   <p>${_('Pull request was closed with status')}: <b>${status_change}</b></p>
-%endif
+    </h4>
+    </td></tr>
+    <tr><td style="padding-right:20px;padding-top:15px;">${_('Source')}</td><td style="padding-top:15px;"><a style="color:#427cc9;text-decoration:none;cursor:pointer" href="${pr_source_repo_url}">${pr_source_repo.repo_name}</a></td></tr>
+    % if status_change:
+        <tr><td style="padding-right:20px;">${_('Submitted status')}</td><td>${base.status_text(status_change, tag_type=status_change_type)}</td></tr>
+    % endif
+    <tr><td style="padding-right:20px;">${(_('Comment on line: %(comment_line)s') if comment_file else _('Comment')) % data}</td><td style="line-height:1.2em;white-space:pre-wrap">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
+</table>

rhodecode/templates/email_templates/pull_request_review.mako

@@ -1,26 +1,37 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
+<%namespace name="base" file="base.mako"/>
 
 <%def name="subject()" filter="n,trim">
-    ${_('%(user)s wants you to review pull request #%(pr_url)s: "%(pr_title)s"') % {
-     'user': h.person(user),
-     'pr_title': pull_request.title,
-     'pr_url': pull_request.pull_request_id
-     } |n}
+<%
+data = {
+    'user': h.person(user),
+    'pr_id': pull_request.pull_request_id,
+    'pr_title': pull_request.title,
+}
+%>
+
+${_('%(user)s wants you to review pull request #%(pr_id)s: "%(pr_title)s"') % data |n}
 </%def>
 
 
 <%def name="body_plaintext()" filter="n,trim">
+<%
+data = {
+    'user': h.person(user),
+    'pr_id': pull_request.pull_request_id,
+    'pr_title': pull_request.title,
+    'source_ref_type': pull_request.source_ref_parts.type,
+    'source_ref_name': pull_request.source_ref_parts.name,
+    'target_ref_type': pull_request.target_ref_parts.type,
+    'target_ref_name': pull_request.target_ref_parts.name,
+    'repo_url': pull_request_source_repo_url
+}
+%>
 ${self.subject()}
 
 
-${h.literal(_('Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s into %(target_ref_type)s:%(target_ref_name)s') % {
-   'source_ref_type': pull_request.source_ref_parts.type,
-   'source_ref_name': pull_request.source_ref_parts.name,
-   'target_ref_type': pull_request.target_ref_parts.type,
-   'target_ref_name': pull_request.target_ref_parts.name,
-   'repo_url': pull_request_source_repo_url
-})}
+${h.literal(_('Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s into %(target_ref_type)s:%(target_ref_name)s') % data)}
 
 
 * ${_('Link')}: ${pull_request_url}
@@ -29,53 +40,46 b''
 
 * ${_('Description')}:
 
-  ${pull_request.description}
+${pull_request.description}
 
 
 * ${ungettext('Commit (%(num)s)', 'Commits (%(num)s)', len(pull_request_commits) ) % {'num': len(pull_request_commits)}}:
 
 % for commit_id, message in pull_request_commits:
         - ${h.short_id(commit_id)}
+          ${h.chop_at_smart(message, '\n', suffix_if_chopped='...')}
 
-        ${h.chop_at_smart(message, '\n', suffix_if_chopped='...')}
 % endfor
 
+${self.plaintext_footer()}
 </%def>
-
-
-<h4>
-${_('%(user)s wants you to review pull request #%(pr_id)s: "%(pr_title)s".') % {
- 'user': h.person(user),
- 'pr_title': pull_request.title,
- 'pr_id': pull_request.pull_request_id
- } }
-</h4>
-
-<p>${h.literal(_('Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s into %(target_ref_type)s:%(target_ref_name)s') % {
-   'source_ref_type': pull_request.source_ref_parts.type,
-   'source_ref_name': pull_request.source_ref_parts.name,
-   'target_ref_type': pull_request.target_ref_parts.type,
-   'target_ref_name': pull_request.target_ref_parts.name,
-   'repo_url': h.link_to(pull_request_source_repo.repo_name, pull_request_source_repo_url)
-   })}
-</p>
-
-<p>${_('Link')}: ${h.link_to(pull_request_url, pull_request_url)}</p>
-
-<p><strong>${_('Title')}</strong>: ${pull_request.title}</p>
-<p>
-    <strong>${_('Description')}:</strong><br/>
-    <span style="white-space: pre-wrap;">${pull_request.description}</span>
-</p>
-
-<p>
-    <strong>${ungettext('Commit (%(num)s)', 'Commits (%(num)s)', len(pull_request_commits) ) % {'num': len(pull_request_commits)}}</strong>:
-    <ol>
-    % for commit_id, message in pull_request_commits:
-        <li>
-            <pre>${h.short_id(commit_id)}</pre>
-            ${h.chop_at_smart(message, '\n', suffix_if_chopped='...')}
-        </li>
-    % endfor
-    </ol>
-</p>
+<%
+data = {
+    'user': h.person(user),
+    'pr_id': pull_request.pull_request_id,
+    'pr_title': pull_request.title,
+    'source_ref_type': pull_request.source_ref_parts.type,
+    'source_ref_name': pull_request.source_ref_parts.name,
+    'target_ref_type': pull_request.target_ref_parts.type,
+    'target_ref_name': pull_request.target_ref_parts.name,
+    'repo_url': pull_request_source_repo_url,
+    'source_repo_url': h.link_to(pull_request_source_repo.repo_name, pull_request_source_repo_url),
+    'target_repo_url': h.link_to(pull_request_target_repo.repo_name, pull_request_target_repo_url)
+}
+%>
+<table style="text-align:left;vertical-align:middle;">
+    <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;"><h4><a href="${pull_request_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s wants you to review pull request #%(pr_id)s: "%(pr_title)s".') % data }</a></h4></td></tr>
+    <tr><td style="padding-right:20px;padding-top:15px;">${_('Title')}</td><td style="padding-top:15px;">${pull_request.title}</td></tr>
+    <tr><td style="padding-right:20px;">${_('Source')}</td><td>${base.tag_button(pull_request.source_ref_parts.name)} ${h.literal(_('%(source_ref_type)s of %(source_repo_url)s') % data)}</td></tr>
+    <tr><td style="padding-right:20px;">${_('Target')}</td><td>${base.tag_button(pull_request.target_ref_parts.name)} ${h.literal(_('%(target_ref_type)s of %(target_repo_url)s') % data)}</td></tr>
+    <tr><td style="padding-right:20px;">${_('Description')}</td><td style="white-space:pre-wrap">${pull_request.description}</td></tr>
+    <tr><td style="padding-right:20px;">${ungettext('%(num)s Commit', '%(num)s Commits', len(pull_request_commits)) % {'num': len(pull_request_commits)}}</td>
+        <td><ol style="margin:0 0 0 1em;padding:0;text-align:left;">
+            % for commit_id, message in pull_request_commits:
+            <li style="margin:0 0 1em;"><pre style="margin:0 0 .5em">${h.short_id(commit_id)}</pre>
+                ${h.chop_at_smart(message, '\n', suffix_if_chopped='...')}
+            </li>
+            % endfor
+        </ol></td>
+    </tr>
+</table>

rhodecode/templates/email_templates/user_registration.mako

@@ -2,10 +2,9 b''
 <%inherit file="base.mako"/>
 
 <%def name="subject()" filter="n,trim">
-RhodeCode new user registration
+RhodeCode new user registration: ${user.username}
 </%def>
 
-## plain text version of the email. Empty by default
 <%def name="body_plaintext()" filter="n,trim">
 
 A new user `${user.username}` has registered on ${h.format_date(date)}
@@ -14,9 +13,15 b' A new user `${user.username}` has regist'
 - Full Name: ${user.firstname} ${user.lastname}
 - Email: ${user.email}
 - Profile link: ${h.url('user_profile', username=user.username, qualified=True)}
+
+${self.plaintext_footer()}
 </%def>
 
 ## BODY GOES BELOW
-<div style="white-space: pre-wrap">
-${body_plaintext()}
-</div>
+<table style="text-align:left;vertical-align:middle;">
+    <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;"><h4><a href="${h.url('user_profile', username=user.username, qualified=True)}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('New user %(user)s has registered on %(date)s') % {'user': user.username, 'date': h.format_date(date)}}</h4></td></tr>
+    <tr><td style="padding-right:20px;padding-top:20px;">${_('Username')}</td><td style="line-height:1;padding-top:20px;"><img style="margin-bottom:-5px;text-align:left;border:1px solid #dbd9da" src="${h.gravatar_url(user.email, 16)}" height="16" width="16">&nbsp;${user.username}</td></tr>
+    <tr><td style="padding-right:20px;">${_('Full Name')}</td><td>${user.firstname} ${user.lastname}</td></tr>
+    <tr><td style="padding-right:20px;">${_('Email')}</td><td>${user.email}</td></tr>
+    <tr><td style="padding-right:20px;">${_('Profile')}</td><td><a href="${h.url('user_profile', username=user.username, qualified=True)}">${h.url('user_profile', username=user.username, qualified=True)}</a></td></tr>
+</table>
  No newline at end of file

rhodecode/templates/errors/error_document.html

@@ -5,7 +5,7 b''
         <title>Error - ${c.error_message}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <meta name="robots" content="index, nofollow"/>
-        <link rel="icon" href="${h.url('/images/favicon.ico')}" sizes="16x16 32x32" type="image/png" />
+        <link rel="icon" href="${h.asset('images/favicon.ico')}" sizes="16x16 32x32" type="image/png" />
 
 
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
@@ -13,20 +13,20 b''
             <meta http-equiv="refresh" content="${c.redirect_time}; url=${c.url_redirect}"/>
         %endif
 
-        <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen"/>
+        <link rel="stylesheet" type="text/css" href="${h.asset('css/style.css', ver=c.rhodecode_version_hash)}" media="screen"/>
         <!--[if IE]>
-            <link rel="stylesheet" type="text/css" href="${h.url('/css/ie.css')}" media="screen"/>
+            <link rel="stylesheet" type="text/css" href="${h.asset('css/ie.css')}" media="screen"/>
         <![endif]-->
         <style>body { background:#eeeeee; }</style>
 
-        <script type="text/javascript" src="${h.url('/js/scripts.js')}"></script>
+        <script type="text/javascript" src="${h.asset('js/scripts.js', ver=c.rhodecode_version_hash)}"></script>
     </head>
     <body>
         <%include file="/base/flash_msg.html"/>
 
         <div class="wrapper error_page">
             <div class="sidebar">
-                <a href="${h.url('home')}"><img class="error-page-logo" src="${h.url('/images/RhodeCode_Logo_Black.png')}" alt="RhodeCode"/></a>
+                <a href="${h.url('home')}"><img class="error-page-logo" src="${h.asset('images/RhodeCode_Logo_Black.png')}" alt="RhodeCode"/></a>
             </div>
             <div class="main-content">
                 <h1>

rhodecode/templates/files/diff_2way.html

@@ -4,11 +4,11 b''
 <%namespace name="diff_block" file="/changeset/diff_block.html"/>
 
 <%def name="js_extra()">
-<script type="text/javascript" src="${h.url('/js/mergerly.js')}"></script>
+<script type="text/javascript" src="${h.asset('js/mergerly.js')}"></script>
 </%def>
 
 <%def name="css_extra()">
-<link rel="stylesheet" type="text/css" href="${h.url('/css/mergerly.css')}"/>
+<link rel="stylesheet" type="text/css" href="${h.asset('css/mergerly.css')}"/>
 </%def>
 
 <%def name="title()">
@@ -58,7 +58,7 b''
               </td>
               <td>
                 <div class="changes pull-right">${h.fancy_file_stats(c.diff_data['stats'])}</div>
-                <div class="comment-bubble pull-right" data-path="${c.node1.path}">
+                <div class="comment-bubble pull-right" data-path="${h.safe_unicode(c.node1.path)}">
                   <i class="icon-comment"></i>
                 </div>
               </td>

rhodecode/templates/files/file_authors_box.html

@@ -12,24 +12,18 b''
 </div>
 
 % if c.authors:
-<ul class="pull-left">
+<ul class="sidebar-right-content">
     % for email, user in sorted(c.authors, key=lambda e: c.file_last_commit.author_email!=e[0]):
     <li class="file_author">
-      <div class="contributor tooltip"  title="${h.tooltip(user)}">
-        ${base.gravatar(email, 16)}
-        <span class="author user">
-            ## case initial page load we only have last commit author
-            % if c.file_author:
-                ${h.link_to_user(user)} - ${h.age_component(c.file_last_commit.date)}
-            % else:
-                % if c.file_last_commit.author_email==email:
-                    <strong>${h.link_to_user(user)}</strong> (${_('last author')})
-                % else:
-                    ${h.link_to_user(user)}
-                % endif
-            % endif
-        </span>
-      </div>
+        <div class="rc-user tooltip" title="${h.author_string(email)}">
+          ${base.gravatar(email, 16)}
+          <span class="user">${h.link_to_user(user)}</span>
+        </div>
+        % if c.file_author: 
+            <div class="user-inline-data">- ${h.age_component(c.file_last_commit.date)}</div>
+        % elif c.file_last_commit.author_email==email:
+            <div class="user-inline-data"> (${_('last author')})</div>
+        % endif
     </li>
     % endfor
 </ul>

rhodecode/templates/files/file_tree_author_box.html

@@ -6,9 +6,7 b''
   </h4>
 </div>
 <div class="sidebar-right-content">
-  ${base.gravatar(h.email_or_none(c.commit.author), 16)}
-  <span class="author user">
-      ${h.link_to_user(c.commit.author)} - ${h.age_component(c.commit.date)}
-  </span>
+    ${base.gravatar_with_user(c.commit.author)}
+    <div class="user-inline-data">- ${h.age_component(c.commit.date)}</div>
 </div>
 

rhodecode/templates/files/files.html

@@ -91,37 +91,26 b''
             if (source_page) {
                 return false;
             }
+
+            if ($('#file-tree-wrapper').hasClass('full-load')) {
+                // in case our HTML wrapper has full-load class we don't
+                // trigger the async load of metadata
+                return false;
+            }
+
             var state = getState('metadata');
             var url_data = {
                 'repo_name': templateContext.repo_name,
-                'revision': state.commit_id,
+                'commit_id': state.commit_id,
                 'f_path': state.f_path
             };
 
-            var url = pyroutes.url('files_metadata_list_home', url_data);
+            var url = pyroutes.url('files_nodetree_full', url_data);
 
             metadataRequest = $.ajax({url: url});
 
             metadataRequest.done(function(data) {
-                var data = data.metadata;
-                var dataLength = data.length;
-                for (var i = 0; i < dataLength; i++) {
-                    var rowData = data[i];
-                    var name = rowData.name.replace('\\', '\\\\');
-
-                    $('td[title="size-' + name + '"]').html(rowData.size);
-                    var timeComponent = AgeModule.createTimeComponent(
-                            rowData.modified_ts, rowData.modified_at);
-                    $('td[title="modified_at-' + name + '"]').html(timeComponent);
-
-                    $('td[title="revision-' + name + '"]').html(
-                            '<div class="tooltip" title="{0}"><pre>r{1}:{2}</pre></div>'.format(
-                                    data[i].message, data[i].revision, data[i].short_id));
-                    $('td[title="author-' + name + '"]').html(
-                            '<span title="{0}">{1}</span>'.format(
-                                    data[i].author, data[i].user_profile));
-                }
-                tooltip_activate();
+                $('#file-tree').html(data);
                 timeagoActivate();
             });
             metadataRequest.fail(function (data, textStatus, errorThrown) {
@@ -134,13 +123,12 b''
 
         var callbacks = function() {
             var state = getState('callbacks');
-            tooltip_activate();
             timeagoActivate();
 
             // used for history, and switch to
             var initialCommitData = {
                 id: null,
-                text: "${_("Switch To Commit")}",
+                text: '${_("Switch To Commit")}',
                 type: 'sha',
                 raw_id: null,
                 files_url: null
@@ -316,7 +304,6 b''
                 $('#file_history_overview').hide();
                 $('#file_history_overview_full').show();
                 timeagoActivate();
-                tooltip_activate();
             } else {
                 callbacks();
             }
@@ -332,5 +319,4 b''
 
     </script>
 
-
 </%def>

rhodecode/templates/files/files_browser.html

@@ -41,67 +41,11 b''
             </div>
         </div>
     </div>
-
-    <div class="browser-body">
-        <table class="code-browser rctable">
-            <thead>
-                <tr>
-                    <th>${_('Name')}</th>
-                    <th>${_('Size')}</th>
-                    <th>${_('Modified')}</th>
-                    <th>${_('Last Commit')}</th>
-                    <th>${_('Author')}</th>
-                </tr>
-            </thead>
+    ## file tree is computed from caches, and filled in
+    <div id="file-tree">
+    ${c.file_tree}
+    </div>
 
-            <tbody id="tbody">
-              %if c.file.parent:
-              <tr class="parity0">
-                <td class="td-componentname">
-                  <a href='${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=c.file.parent.path)}' class="pjax-link">
-                    <i class="icon-folder"></i>..
-                  </a>
-                </td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-              </tr>
-              %endif
-              %for cnt,node in enumerate(c.file):
-              <tr class="parity${cnt%2}">
-                <td class="td-componentname">
-                %if node.is_submodule():
-                  <span class="submodule-dir">
-                    ${h.link_to_if(
-                        node.url.startswith('http://') or node.url.startswith('https://'),
-                        node.name,node.url)}
-                  </span>
-                %else:
-                  <a href='${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=h.safe_unicode(node.path))}' class="pjax-link">
-                    <i class="${"icon-file browser-file" if node.is_file() else "icon-folder browser-dir"}"></i>${node.name}
-                  </a>
-                %endif
-                </td>
-                %if node.is_file():
-                  <td class="td-size" title="${'size-%s' % node.name}"></td>
-                  <td class="td-time" title="${'modified_at-%s' % node.name}">
-                    <span class="browser-loading">${_('Loading...')}</span>
-                  </td>
-                  <td class="td-hash" title="${'revision-%s' % node.name}"></td>
-                  <td class="td-user" title="${'author-%s' % node.name}"></td>
-                %else:
-                  <td></td>
-                  <td></td>
-                  <td></td>
-                  <td></td>
-                %endif
-              </tr>
-              %endfor
-            </tbody>
-            <tbody id="tbody_filtered"></tbody>
-        </table>
-    </div>
 </div>
 
 <script>

rhodecode/templates/files/files_pjax.html

@@ -40,7 +40,7 b''
             <%include file='file_tree_author_box.html'/>
         </div>
 
-        ${c.file_tree}
+        <%include file='files_browser.html'/>
     % else:
         <div id="file_authors" class="sidebar-right">
             <%include file='file_authors_box.html'/>

rhodecode/templates/followers/followers_data.html

@@ -23,8 +23,6 b''
     $(document).on('pjax:success',function(){
         show_more_event();
         timeagoActivate();
-        tooltip_activate();
-        show_changeset_tooltip();
     });
 </script>
 ${c.followers_pager.pager('$link_previous ~2~ $link_next')}

rhodecode/templates/forks/forks_data.html

@@ -38,8 +38,6 b''
     $(document).on('pjax:success',function(){
       show_more_event();
       timeagoActivate();
-      tooltip_activate();
-      show_changeset_tooltip();
    });
   </script>
   ${c.forks_pager.pager('$link_previous ~2~ $link_next')}

rhodecode/templates/index_base.html

@@ -102,11 +102,11 b''
                       "sort": "owner"}, title: "${_('Owner')}", className: "td-user" }
           ],
           language: {
-            paginate: DEFAULT_GRID_PAGINATION
+            paginate: DEFAULT_GRID_PAGINATION,
+            emptyTable: _gettext("No repository groups available yet.")
           },
           "drawCallback": function( settings, json ) {
               timeagoActivate();
-              tooltip_activate();
               quick_repo_menu();
           }
         });
@@ -135,11 +135,11 b''
                       "sort": "rss"}, title: "rss", className: "td-rss" }
           ],
           language: {
-              paginate: DEFAULT_GRID_PAGINATION
+              paginate: DEFAULT_GRID_PAGINATION,
+              emptyTable: _gettext("No repositories available yet.")
           },
           "drawCallback": function( settings, json ) {
               timeagoActivate();
-              tooltip_activate();
               quick_repo_menu();
           }
         });

rhodecode/templates/journal/journal.html

@@ -46,8 +46,6 b''
     $('#j_filter').autoGrowInput();
     $(document).on('pjax:success',function(){
       show_more_event();
-      tooltip_activate();
-      show_changeset_tooltip();
     });
     $(document).pjax('#refresh', '#journal',
                      {url: "${h.url.current(filter=c.search_term)}", push: false});

rhodecode/templates/journal/journal_data.html

@@ -44,8 +44,6 b''
       $(document).on('pjax:success',function(){
         show_more_event();
         timeagoActivate();
-        tooltip_activate();
-        show_changeset_tooltip();
       });
     </script>
 %else:

rhodecode/templates/login.html

@@ -14,7 +14,7 b''
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
@@ -25,7 +25,7 b''
 
     <div class="loginwrapper">
         <div class="left-column">
-            <img class="sign-in-image" src="${h.url('/images/sign-in.png')}" alt="RhodeCode"/>
+            <img class="sign-in-image" src="${h.asset('images/sign-in.png')}" alt="RhodeCode"/>
         </div>
         <%block name="above_login_button" />
         <div id="login" class="right-column">
@@ -59,7 +59,7 b''
 
                     <p class="links">
                         ${h.link_to(_('Forgot your password?'), h.route_path('reset_password'))}
-                    </p> 
+                    </p>
 
                     ${h.submit('sign_in', _('Sign In'), class_="btn sign-in")}
 

rhodecode/templates/password_reset.html

@@ -14,7 +14,7 b''
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
@@ -25,9 +25,9 b''
 
     <div class="loginwrapper">
         <div class="left-column">
-            <img class="sign-in-image" src="${h.url('/images/sign-in.png')}" alt="RhodeCode"/>
+            <img class="sign-in-image" src="${h.asset('images/sign-in.png')}" alt="RhodeCode"/>
         </div>
-        
+
         <div id="register" class="right-column">
             <%include file="/base/flash_msg.html"/>
             <!-- login -->
@@ -57,7 +57,7 b''
                     %endif
 
                     ${h.submit('send', _('Send password reset email'), class_="btn sign-in")}
-                    <div class="activation_msg">${_('Password reset link will be send to matching email address')}</div>
+                    <div class="activation_msg">${_('Password reset link will be sent to matching email address')}</div>
 
                 ${h.end_form()}
             </div>

rhodecode/templates/pullrequests/pullrequest_show.html

@@ -311,6 +311,10 b''
                           %endif
                       </td>
                       <td class="td-actions rc-form">
+                        <div data-comment-id="${FID}" class="btn-link show-inline-comments comments-visible">
+                          <span class="comments-show">${_('Show comments')}</span>
+                          <span class="comments-hide">${_('Hide comments')}</span>
+                        </div>
                       </td>
                   </tr>
                   <tr id="tr_${FID}">
@@ -559,6 +563,23 b''
             $('#close_pull_request').on('click', function(e){
                 closePullRequest("${c.repo_name}", "${c.pull_request.pull_request_id}");
             });
+
+            $('.show-inline-comments').on('click', function(e){
+                var boxid = $(this).attr('data-comment-id');
+                var button = $(this);
+  
+                if(button.hasClass("comments-visible")) {
+                  $('#{0} .inline-comments'.format(boxid)).each(function(index){
+                    $(this).hide();
+                  })
+                  button.removeClass("comments-visible");
+                } else {
+                  $('#{0} .inline-comments'.format(boxid)).each(function(index){
+                    $(this).show();
+                  })
+                  button.addClass("comments-visible");
+                }
+            });
         })
       </script>
 

rhodecode/templates/pullrequests/pullrequests.html

@@ -108,11 +108,11 b''
                   "sort": "updated_on_raw"}, title: "${_('Updated on')}", className: "td-time" }
       ],
       language: {
-            paginate: DEFAULT_GRID_PAGINATION
+            paginate: DEFAULT_GRID_PAGINATION,
+            emptyTable: _gettext("No pull requests available yet.")
       },
       "drawCallback": function( settings, json ) {
           timeagoActivate();
-          tooltip_activate();
       },
       "createdRow": function ( row, data, index ) {
           if (data['closed']) {

rhodecode/templates/register.html

@@ -14,7 +14,7 b''
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.url('home')}"><img src="${h.url('/images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>
@@ -25,7 +25,7 b''
 
     <div class="loginwrapper">
         <div class="left-column">
-            <img class="sign-in-image" src="${h.url('/images/sign-in.png')}" alt="RhodeCode"/>
+            <img class="sign-in-image" src="${h.asset('images/sign-in.png')}" alt="RhodeCode"/>
         </div>
         <%block name="above_register_button" />
         <div id="register" class="right-column">

rhodecode/templates/summary/summary.html

@@ -50,8 +50,8 b''
             <a href="${h.url('files_home',repo_name=c.repo_name,revision='tip',f_path=c.readme_file)}">${c.readme_file}</a>
         </h3>
     </div>
-    <div class="readme">
-      <div class="readme_box">
+    <div class="readme codeblock">
+      <div class="readme_box markdown-block">
         ${c.readme_data|n}
       </div>
     </div>

rhodecode/templates/tags/tags.html

@@ -68,11 +68,11 b''
                   "sort": "compare"}, title: "${_('Compare')}", className: "td-compare" }
       ],
       language: {
-            paginate: DEFAULT_GRID_PAGINATION
+            paginate: DEFAULT_GRID_PAGINATION,
+            emptyTable: _gettext("No tags available yet.")
       },
       "initComplete": function(settings, json) {
           get_datatable_count();
-          tooltip_activate();
           timeagoActivate();
           compare_radio_buttons("${c.repo_name}", 'tag');
       }
@@ -81,7 +81,6 b''
     // update when things change
     $('#obj_list_table').on('draw.dt', function() {
         get_datatable_count();
-        tooltip_activate();
         timeagoActivate();
     });
 

rhodecode/tests/config/test_environment.py

@@ -25,68 +25,6 b' import pytest'
 from rhodecode.config import environment
 
 
-class TestUseDirectHookCalls(object):
-    @pytest.mark.parametrize('config', [
-        {
-            'vcs.hooks.direct_calls': 'true',
-            'base_path': 'fake_base_path'
-        }
-    ])
-    def test_returns_true_when_conditions_are_met(self, config):
-        result = environment._use_direct_hook_calls(config)
-        assert result is True
-
-    @pytest.mark.parametrize('config', [
-        {
-            'vcs.hooks.direct_calls': 'false',
-            'base_path': 'fake_base_path'
-        },
-        {
-            'base_path': 'fake_base_path'
-        }
-    ])
-    def test_returns_false_when_conditions_are_not_met(self, config):
-        result = environment._use_direct_hook_calls(config)
-        assert result is False
-
-
-class TestGetVcsHooksProtocol(object):
-    def test_returns_pyro4_by_default(self):
-        config = {}
-        result = environment._get_vcs_hooks_protocol(config)
-        assert result == 'pyro4'
-
-    @pytest.mark.parametrize('protocol', ['PYRO4', 'HTTP', 'Pyro4', 'Http'])
-    def test_returns_lower_case_value(self, protocol):
-        config = {
-            'vcs.hooks.protocol': protocol
-        }
-        result = environment._get_vcs_hooks_protocol(config)
-        assert result == protocol.lower()
-
-
-class TestLoadEnvironment(object):
-    def test_calls_use_direct_hook_calls(self, _external_calls_patcher):
-        global_conf = {
-            'here': '',
-            'vcs.connection_timeout': '0',
-            'vcs.server.enable': 'false'
-        }
-        app_conf = {
-            'cache_dir': '/tmp/',
-            '__file__': '/tmp/abcde.ini'
-        }
-        direct_calls_patcher = mock.patch.object(
-            environment, '_use_direct_hook_calls', return_value=True)
-        protocol_patcher = mock.patch.object(
-            environment, '_get_vcs_hooks_protocol', return_value='http')
-        with direct_calls_patcher as direct_calls_mock, \
-                protocol_patcher as protocol_mock:
-            environment.load_environment(global_conf, app_conf)
-        direct_calls_mock.call_count == 1
-        protocol_mock.call_count == 1
-
-
 @pytest.fixture
 def _external_calls_patcher(request):
     # TODO: mikhail: This is a temporary solution. Ideally load_environment

rhodecode/tests/functional/test_admin_auth_settings.py

@@ -47,10 +47,10 b' class TestAuthSettingsController(object)'
         for plugin in plugins_list.split(','):
             plugin_name = plugin.partition('#')[-1]
             enabled_plugin = '%s_enabled' % plugin_name
-            cache_ttl = '%s_auth_cache_ttl' % plugin_name
+            cache_ttl = '%s_cache_ttl' % plugin_name
 
             # default params that are needed for each plugin,
-            # `enabled` and `auth_cache_ttl`
+            # `enabled` and `cache_ttl`
             params.update({
                 enabled_plugin: True,
                 cache_ttl: 0
@@ -67,7 +67,7 b' class TestAuthSettingsController(object)'
         for _plugin in _enabled_plugins:
             db_plugin = SettingsModel().get_setting_by_name(_plugin)
             if db_plugin:
-                Session.delete(db_plugin)
+                Session().delete(db_plugin)
         Session().commit()
 
         response = self.app.post(url=test_url, params=params)
@@ -97,7 +97,7 b' class TestAuthSettingsController(object)'
             'attr_firstname': 'ima',
             'attr_lastname': 'tester',
             'attr_email': '[e-mail]',
-            'auth_cache_ttl': '0',
+            'cache_ttl': '0',
         })
         if force:
             params = {}
@@ -113,8 +113,7 b' class TestAuthSettingsController(object)'
         response.mustcontain('Authentication Plugins')
 
     @pytest.mark.parametrize("disable_plugin, needs_import", [
-        pytest.mark.xfail(('egg:rhodecode-enterprise-ce#container', None),
-                          reason="Migration of container plugin pending."),
+        ('egg:rhodecode-enterprise-ce#headers', None),
         ('egg:rhodecode-enterprise-ce#crowd', None),
         ('egg:rhodecode-enterprise-ce#jasig_cas', None),
         ('egg:rhodecode-enterprise-ce#ldap', None),
@@ -191,7 +190,7 b' class TestAuthSettingsController(object)'
             'attr_firstname': 'ima',
             'attr_lastname': 'tester',
             'attr_email': '[e-mail]',
-            'auth_cache_ttl': '60',
+            'cache_ttl': '60',
             'csrf_token': csrf_token,
             }
         )

rhodecode/tests/functional/test_admin_gists.py

@@ -129,40 +129,33 b' class TestGistsController(TestController'
         for gist in GistModel.get_all():
             response.mustcontain(no=['gist: %s' % gist.gist_access_id])
 
-    def test_create_missing_description(self):
+    def test_create(self):
         self.log_user()
         response = self.app.post(
             url('gists'),
-            params={'lifetime': -1, 'csrf_token': self.csrf_token},
-            status=200)
-
-        response.mustcontain('Missing value')
-
-    def test_create(self):
-        self.log_user()
-        response = self.app.post(url('gists'),
-                                 params={'lifetime': -1,
-                                         'content': 'gist test',
-                                         'filename': 'foo',
-                                         'public': 'public',
-                                         'acl_level': Gist.ACL_LEVEL_PUBLIC,
-                                         'csrf_token': self.csrf_token},
-                                 status=302)
+            params={'lifetime': -1,
+                    'content': 'gist test',
+                    'filename': 'foo',
+                    'public': 'public',
+                    'gist_acl_level': Gist.ACL_LEVEL_PUBLIC,
+                    'csrf_token': self.csrf_token},
+            status=302)
         response = response.follow()
         response.mustcontain('added file: foo')
         response.mustcontain('gist test')
 
     def test_create_with_path_with_dirs(self):
         self.log_user()
-        response = self.app.post(url('gists'),
-                                 params={'lifetime': -1,
-                                         'content': 'gist test',
-                                         'filename': '/home/foo',
-                                         'public': 'public',
-                                         'acl_level': Gist.ACL_LEVEL_PUBLIC,
-                                         'csrf_token': self.csrf_token},
-                                 status=200)
-        response.mustcontain('Filename cannot be inside a directory')
+        response = self.app.post(
+            url('gists'),
+            params={'lifetime': -1,
+                    'content': 'gist test',
+                    'filename': '/home/foo',
+                    'public': 'public',
+                    'gist_acl_level': Gist.ACL_LEVEL_PUBLIC,
+                    'csrf_token': self.csrf_token},
+            status=200)
+        response.mustcontain('Filename /home/foo cannot be inside a directory')
 
     def test_access_expired_gist(self, create_gist):
         self.log_user()
@@ -175,14 +168,15 b' class TestGistsController(TestController'
 
     def test_create_private(self):
         self.log_user()
-        response = self.app.post(url('gists'),
-                                 params={'lifetime': -1,
-                                         'content': 'private gist test',
-                                         'filename': 'private-foo',
-                                         'private': 'private',
-                                         'acl_level': Gist.ACL_LEVEL_PUBLIC,
-                                         'csrf_token': self.csrf_token},
-                                 status=302)
+        response = self.app.post(
+            url('gists'),
+            params={'lifetime': -1,
+                    'content': 'private gist test',
+                    'filename': 'private-foo',
+                    'private': 'private',
+                    'gist_acl_level': Gist.ACL_LEVEL_PUBLIC,
+                    'csrf_token': self.csrf_token},
+            status=302)
         response = response.follow()
         response.mustcontain('added file: private-foo<')
         response.mustcontain('private gist test')
@@ -193,14 +187,15 b' class TestGistsController(TestController'
 
     def test_create_private_acl_private(self):
         self.log_user()
-        response = self.app.post(url('gists'),
-                                 params={'lifetime': -1,
-                                         'content': 'private gist test',
-                                         'filename': 'private-foo',
-                                         'private': 'private',
-                                         'acl_level': Gist.ACL_LEVEL_PRIVATE,
-                                         'csrf_token': self.csrf_token},
-                                 status=302)
+        response = self.app.post(
+            url('gists'),
+            params={'lifetime': -1,
+                    'content': 'private gist test',
+                    'filename': 'private-foo',
+                    'private': 'private',
+                    'gist_acl_level': Gist.ACL_LEVEL_PRIVATE,
+                    'csrf_token': self.csrf_token},
+            status=302)
         response = response.follow()
         response.mustcontain('added file: private-foo<')
         response.mustcontain('private gist test')
@@ -211,15 +206,16 b' class TestGistsController(TestController'
 
     def test_create_with_description(self):
         self.log_user()
-        response = self.app.post(url('gists'),
-                                 params={'lifetime': -1,
-                                         'content': 'gist test',
-                                         'filename': 'foo-desc',
-                                         'description': 'gist-desc',
-                                         'public': 'public',
-                                         'acl_level': Gist.ACL_LEVEL_PUBLIC,
-                                         'csrf_token': self.csrf_token},
-                                 status=302)
+        response = self.app.post(
+            url('gists'),
+            params={'lifetime': -1,
+                    'content': 'gist test',
+                    'filename': 'foo-desc',
+                    'description': 'gist-desc',
+                    'public': 'public',
+                    'gist_acl_level': Gist.ACL_LEVEL_PUBLIC,
+                    'csrf_token': self.csrf_token},
+             status=302)
         response = response.follow()
         response.mustcontain('added file: foo-desc')
         response.mustcontain('gist test')
@@ -233,7 +229,7 b' class TestGistsController(TestController'
             'filename': 'foo-desc',
             'description': 'gist-desc',
             'public': 'public',
-            'acl_level': Gist.ACL_LEVEL_PUBLIC,
+            'gist_acl_level': Gist.ACL_LEVEL_PUBLIC,
             'csrf_token': self.csrf_token
         }
         response = self.app.post(url('gists'), params=params, status=302)

rhodecode/tests/functional/test_admin_repo_settings.py

@@ -18,9 +18,13 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import mock
 import pytest
 
+import rhodecode
+from rhodecode.model.settings import SettingsModel
 from rhodecode.tests import url, HG_REPO
+from rhodecode.tests.utils import AssertResponse
 
 
 @pytest.mark.usefixtures('autologin_user', 'app')
@@ -38,3 +42,77 b' class TestAdminRepoSettingsController:'
     ])
     def test_simple_get(self, urlname, app):
         app.get(url(urlname, repo_name=HG_REPO))
+
+    @pytest.mark.parametrize('setting_name, setting_backends', [
+        ('hg_use_rebase_for_merging', ['hg']),
+    ])
+    def test_labs_settings_visible_if_enabled(
+            self, setting_name, setting_backends, backend):
+        if backend.alias not in setting_backends:
+            pytest.skip('Setting not available for backend {}'.format(backend))
+
+        vcs_settings_url = url(
+            'repo_vcs_settings', repo_name=backend.repo.repo_name)
+
+        with mock.patch.dict(
+                rhodecode.CONFIG, {'labs_settings_active': 'true'}):
+            response = self.app.get(vcs_settings_url)
+
+        assertr = AssertResponse(response)
+        assertr.one_element_exists('#rhodecode_{}'.format(setting_name))
+
+    @pytest.mark.parametrize('setting_name, setting_backends', [
+        ('hg_use_rebase_for_merging', ['hg']),
+    ])
+    def test_labs_settings_not_visible_if_disabled(
+            self, setting_name, setting_backends, backend):
+        if backend.alias not in setting_backends:
+            pytest.skip('Setting not available for backend {}'.format(backend))
+
+        vcs_settings_url = url(
+            'repo_vcs_settings', repo_name=backend.repo.repo_name)
+
+        with mock.patch.dict(
+                rhodecode.CONFIG, {'labs_settings_active': 'false'}):
+            response = self.app.get(vcs_settings_url)
+
+        assertr = AssertResponse(response)
+        assertr.no_element_exists('#rhodecode_{}'.format(setting_name))
+
+    @pytest.mark.parametrize('setting_name, setting_backends', [
+        ('hg_use_rebase_for_merging', ['hg']),
+    ])
+    def test_update_boolean_settings(
+            self, csrf_token, setting_name, setting_backends, backend):
+        if backend.alias not in setting_backends:
+            pytest.skip('Setting not available for backend {}'.format(backend))
+
+        repo = backend.create_repo()
+
+        settings_model = SettingsModel(repo=repo)
+        vcs_settings_url = url(
+            'repo_vcs_settings', repo_name=repo.repo_name)
+
+        self.app.post(
+            vcs_settings_url,
+            params={
+                'inherit_global_settings': False,
+                'new_svn_branch': 'dummy-value-for-testing',
+                'new_svn_tag': 'dummy-value-for-testing',
+                'rhodecode_{}'.format(setting_name): 'true',
+                'csrf_token': csrf_token,
+            })
+        setting = settings_model.get_setting_by_name(setting_name)
+        assert setting.app_settings_value
+
+        self.app.post(
+            vcs_settings_url,
+            params={
+                'inherit_global_settings': False,
+                'new_svn_branch': 'dummy-value-for-testing',
+                'new_svn_tag': 'dummy-value-for-testing',
+                'rhodecode_{}'.format(setting_name): 'false',
+                'csrf_token': csrf_token,
+            })
+        setting = settings_model.get_setting_by_name(setting_name)
+        assert not setting.app_settings_value

rhodecode/tests/functional/test_admin_repos.py

@@ -18,14 +18,12 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-import os
 import urllib
 
 import mock
 import pytest
 
 from rhodecode.lib import auth
-from rhodecode.lib import vcs
 from rhodecode.lib.utils2 import safe_str, str2bool
 from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
 from rhodecode.model.db import Repository, RepoGroup, UserRepoToPerm, User,\
@@ -38,9 +36,9 b' from rhodecode.model.user import UserMod'
 from rhodecode.tests import (
     login_user_session, url, assert_session_flash, TEST_USER_ADMIN_LOGIN,
     TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS, HG_REPO, GIT_REPO,
-    TESTS_TMP_PATH, logout_user_session)
+    logout_user_session)
 from rhodecode.tests.fixture import Fixture, error_function
-from rhodecode.tests.utils import AssertResponse
+from rhodecode.tests.utils import AssertResponse, repo_on_filesystem
 
 fixture = Fixture()
 
@@ -1243,14 +1241,6 b' class TestVcsSettings(object):'
         assert repo_element.value == global_element.value
 
 
-def repo_on_filesystem(repo_name):
-    try:
-        vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name))
-        return True
-    except Exception:
-        return False
-
-
 def _get_permission_for_user(user, repo):
     perm = UserRepoToPerm.query()\
         .filter(UserRepoToPerm.repository ==

rhodecode/tests/functional/test_admin_settings.py

@@ -343,6 +343,38 b' class TestAdminSettingsVcs:'
         setting = SettingsModel().get_setting_by_name(setting_key)
         assert setting.app_settings_value is new_value
 
+    def test_has_a_section_for_labs_settings_if_enabled(self, app):
+        with mock.patch.dict(
+                rhodecode.CONFIG, {'labs_settings_active': 'true'}):
+            response = self.app.get(url('admin_settings_vcs'))
+        response.mustcontain('Labs settings:')
+
+    def test_has_not_a_section_for_labs_settings_if_disables(self, app):
+        with mock.patch.dict(
+                rhodecode.CONFIG, {'labs_settings_active': 'false'}):
+            response = self.app.get(url('admin_settings_vcs'))
+        response.mustcontain(no='Labs settings:')
+
+    @pytest.mark.parametrize('new_value', [True, False])
+    def test_allows_to_change_hg_rebase_merge_strategy(
+            self, app, form_defaults, csrf_token, new_value):
+        setting_key = 'hg_use_rebase_for_merging'
+
+        form_defaults.update({
+            'csrf_token': csrf_token,
+            'rhodecode_' + setting_key: str(new_value),
+        })
+
+        with mock.patch.dict(
+                rhodecode.CONFIG, {'labs_settings_active': 'true'}):
+            app.post(
+                url('admin_settings_vcs'),
+                params=form_defaults,
+                status=302)
+
+        setting = SettingsModel().get_setting_by_name(setting_key)
+        assert setting.app_settings_value is new_value
+
     @pytest.fixture
     def disable_sql_cache(self, request):
         patcher = mock.patch(
@@ -414,7 +446,6 b' class TestLabsSettings(object):'
 
     @pytest.mark.parametrize('setting_name', [
         'proxy_subversion_http_requests',
-        'hg_use_rebase_for_merging',
     ])
     def test_update_boolean_settings(self, csrf_token, setting_name):
         self.app.post(

rhodecode/tests/functional/test_commit_comments.py

@@ -25,10 +25,11 b' from rhodecode.tests import *'
 from rhodecode.model.db import (
     ChangesetComment, Notification, UserNotification)
 from rhodecode.model.meta import Session
+from rhodecode.lib import helpers as h
 
 
 @pytest.mark.backends("git", "hg", "svn")
-class TestChangeSetCommentsController(TestController):
+class TestCommitCommentsController(TestController):
 
     @pytest.fixture(autouse=True)
     def prepare(self, request, pylonsapp):
@@ -53,7 +54,8 b' class TestChangeSetCommentsController(Te'
 
     def test_create(self, backend):
         self.log_user()
-        commit_id = backend.repo.get_commit('300').raw_id
+        commit = backend.repo.get_commit('300')
+        commit_id = commit.raw_id
         text = u'CommentOnCommit'
 
         params = {'text': text, 'csrf_token': self.csrf_token}
@@ -77,7 +79,8 b' class TestChangeSetCommentsController(Te'
         comment_id = ChangesetComment.query().first().comment_id
         assert notification.type_ == Notification.TYPE_CHANGESET_COMMENT
 
-        sbj = 'commented on commit of {0}'.format(backend.repo_name)
+        sbj = 'commented on commit `{0}` in the {1} repository'.format(
+            h.show_id(commit), backend.repo_name)
         assert sbj in notification.subject
 
         lnk = (u'/{0}/changeset/{1}#comment-{2}'.format(
@@ -86,7 +89,8 b' class TestChangeSetCommentsController(Te'
 
     def test_create_inline(self, backend):
         self.log_user()
-        commit_id = backend.repo.get_commit('300').raw_id
+        commit = backend.repo.get_commit('300')
+        commit_id = commit.raw_id
         text = u'CommentOnCommit'
         f_path = 'vcs/web/simplevcs/views/repository.py'
         line = 'n1'
@@ -119,8 +123,10 b' class TestChangeSetCommentsController(Te'
         assert notification.type_ == Notification.TYPE_CHANGESET_COMMENT
 
         assert comment.revision == commit_id
-
-        sbj = 'commented on commit of {0}'.format(backend.repo_name)
+        sbj = 'commented on commit `{commit}` ' \
+              '(file: `{f_path}`) in the {repo} repository'.format(
+            commit=h.show_id(commit),
+            f_path=f_path, line=line, repo=backend.repo_name)
         assert sbj in notification.subject
 
         lnk = (u'/{0}/changeset/{1}#comment-{2}'.format(
@@ -154,6 +160,46 b' class TestChangeSetCommentsController(Te'
         # test_regular gets notification by @mention
         assert sorted(users) == [u'test_admin', u'test_regular']
 
+    def test_create_with_status_change(self, backend):
+        self.log_user()
+        commit = backend.repo.get_commit('300')
+        commit_id = commit.raw_id
+        text = u'CommentOnCommit'
+        f_path = 'vcs/web/simplevcs/views/repository.py'
+        line = 'n1'
+
+        params = {'text': text, 'changeset_status': 'approved',
+                  'csrf_token': self.csrf_token}
+
+        self.app.post(
+            url(controller='changeset', action='comment',
+                repo_name=backend.repo_name, revision=commit_id), params=params)
+
+        response = self.app.get(
+            url(controller='changeset', action='index',
+                repo_name=backend.repo_name, revision=commit_id))
+
+        # test DB
+        assert ChangesetComment.query().count() == 1
+        assert_comment_links(response, ChangesetComment.query().count(), 0)
+
+        assert Notification.query().count() == 1
+        assert ChangesetComment.query().count() == 1
+
+        notification = Notification.query().all()[0]
+
+        comment_id = ChangesetComment.query().first().comment_id
+        assert notification.type_ == Notification.TYPE_CHANGESET_COMMENT
+
+        sbj = 'commented on commit `{0}` (status: Approved) ' \
+              'in the {1} repository'.format(
+            h.show_id(commit), backend.repo_name)
+        assert sbj in notification.subject
+
+        lnk = (u'/{0}/changeset/{1}#comment-{2}'.format(
+            backend.repo_name, commit_id, comment_id))
+        assert lnk in notification.body
+
     def test_delete(self, backend):
         self.log_user()
         commit_id = backend.repo.get_commit('300').raw_id

rhodecode/tests/functional/test_files.py

@@ -28,9 +28,13 b' from rhodecode.lib import helpers as h'
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.vcs import nodes
+from rhodecode.lib.vcs.backends.base import EmptyCommit
 from rhodecode.lib.vcs.conf import settings
+from rhodecode.lib.vcs.nodes import FileNode
+from rhodecode.model.db import Repository
+from rhodecode.model.scm import ScmModel
 from rhodecode.tests import (
-    url, assert_session_flash, assert_not_in_session_flash)
+    url, TEST_USER_ADMIN_LOGIN, assert_session_flash, assert_not_in_session_flash)
 from rhodecode.tests.fixture import Fixture
 from rhodecode.tests.utils import AssertResponse
 
@@ -43,6 +47,41 b' NODE_HISTORY = {'
 }
 
 
+
+def _commit_change(
+        repo, filename, content, message, vcs_type, parent=None,
+        newfile=False):
+    repo = Repository.get_by_repo_name(repo)
+    _commit = parent
+    if not parent:
+        _commit = EmptyCommit(alias=vcs_type)
+
+    if newfile:
+        nodes = {
+            filename: {
+                'content': content
+            }
+        }
+        commit = ScmModel().create_nodes(
+            user=TEST_USER_ADMIN_LOGIN, repo=repo,
+            message=message,
+            nodes=nodes,
+            parent_commit=_commit,
+            author=TEST_USER_ADMIN_LOGIN,
+        )
+    else:
+        commit = ScmModel().commit_change(
+            repo=repo.scm_instance(), repo_name=repo.repo_name,
+            commit=parent, user=TEST_USER_ADMIN_LOGIN,
+            author=TEST_USER_ADMIN_LOGIN,
+            message=message,
+            content=content,
+            f_path=filename
+        )
+    return commit
+
+
+    
 @pytest.mark.usefixtures("app")
 class TestFilesController:
 
@@ -54,7 +93,7 b' class TestFilesController:'
 
         params = {
             'repo_name': backend.repo_name,
-            'revision': commit.raw_id,
+            'commit_id': commit.raw_id,
             'date': commit.date
         }
         assert_dirs_in_response(response, ['docs', 'vcs'], params)
@@ -135,7 +174,7 b' class TestFilesController:'
         files = ['README.rst']
         params = {
             'repo_name': backend.repo_name,
-            'revision': commit.raw_id,
+            'commit_id': commit.raw_id,
         }
         assert_dirs_in_response(response, dirs, params)
         assert_files_in_response(response, files, params)
@@ -302,31 +341,34 b' class TestFilesController:'
             url('files_nodelist_home', repo_name=backend.repo_name,
                 f_path='/', revision='tip'), status=400)
 
-    def test_tree_metadata_list_success(self, backend, xhr_header):
+    def test_nodetree_full_success(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
-            url('files_metadata_list_home', repo_name=backend.repo_name,
-                f_path='/', revision=commit.raw_id),
+            url('files_nodetree_full', repo_name=backend.repo_name,
+                f_path='/', commit_id=commit.raw_id),
             extra_environ=xhr_header)
 
-        expected_keys = ['author', 'message', 'modified_at', 'modified_ts',
-                         'name', 'revision', 'short_id', 'size']
-        for filename in response.json.get('metadata'):
-            for key in expected_keys:
-                assert key in filename
+        assert_response = AssertResponse(response)
 
-    def test_tree_metadata_list_if_file(self, backend, xhr_header):
+        for attr in ['data-commit-id', 'data-date', 'data-author']:
+            elements = assert_response.get_elements('[{}]'.format(attr))
+            assert len(elements) > 1
+
+            for element in elements:
+                assert element.get(attr)
+
+    def test_nodetree_full_if_file(self, backend, xhr_header):
         commit = backend.repo.get_commit(commit_idx=173)
         response = self.app.get(
-            url('files_metadata_list_home', repo_name=backend.repo_name,
-                f_path='README.rst', revision=commit.raw_id),
+            url('files_nodetree_full', repo_name=backend.repo_name,
+                f_path='README.rst', commit_id=commit.raw_id),
             extra_environ=xhr_header)
-        assert response.json == {'metadata': []}
+        assert response.body == ''
 
     def test_tree_metadata_list_missing_xhr(self, backend):
         self.app.get(
-            url('files_metadata_list_home', repo_name=backend.repo_name,
-                f_path='/', revision='tip'), status=400)
+            url('files_nodetree_full', repo_name=backend.repo_name,
+                f_path='/', commit_id='tip'), status=400)
 
     def test_access_empty_repo_redirect_to_summary_with_alert_write_perms(
             self, app, backend_stub, autologin_regular_user, user_regular,
@@ -917,13 +959,13 b' class TestChangingFiles:'
 
 def assert_files_in_response(response, files, params):
     template = (
-        "href='/%(repo_name)s/files/%(revision)s/%(name)s'")
+        'href="/%(repo_name)s/files/%(commit_id)s/%(name)s"')
     _assert_items_in_response(response, files, template, params)
 
 
 def assert_dirs_in_response(response, dirs, params):
     template = (
-        "href='/%(repo_name)s/files/%(revision)s/%(name)s'")
+        'href="/%(repo_name)s/files/%(commit_id)s/%(name)s"')
     _assert_items_in_response(response, dirs, template, params)
 
 
@@ -937,3 +979,100 b' def _assert_items_in_response(response, '
 def assert_timeago_in_response(response, items, params):
     for item in items:
         response.mustcontain(h.age_component(params['date']))
+
+
+
[e-mail]("autologin_user", "app")
+class TestSideBySideDiff:
+
+    def test_diff2way(self, app, backend, backend_stub):
+        f_path = 'content'
+        commit1_content = 'content-25d7e49c18b159446c'
+        commit2_content = 'content-603d6c72c46d953420'
+        repo = backend.create_repo()
+
+        commit1 = _commit_change(
+            repo.repo_name, filename=f_path, content=commit1_content,
+            message='A', vcs_type=backend.alias, parent=None, newfile=True)
+
+        commit2 = _commit_change(
+            repo.repo_name, filename=f_path, content=commit2_content,
+            message='B, child of A', vcs_type=backend.alias, parent=commit1)
+
+        response = self.app.get(url(
+            controller='files', action='diff_2way',
+            repo_name=repo.repo_name,
+            diff1=commit1.raw_id,
+            diff2=commit2.raw_id,
+            f_path=f_path))
+
+        assert_response = AssertResponse(response)
+        response.mustcontain(
+            ('Side-by-side Diff r0:%s ... r1:%s') % ( commit1.short_id, commit2.short_id ))
+        response.mustcontain('id="compare"')
+        response.mustcontain((
+            "var orig1_url = '/%s/raw/%s/%s';\n"
+            "var orig2_url = '/%s/raw/%s/%s';") %
+                ( repo.repo_name, commit1.raw_id, f_path,
+                  repo.repo_name, commit2.raw_id, f_path))
+
+
+    def test_diff2way_with_empty_file(self, app, backend, backend_stub):
+        commits = [
+            {'message': 'First commit'},
+            {'message': 'Commit with binary',
+             'added': [nodes.FileNode('file.empty', content='')]},
+        ]
+        f_path='file.empty'
+        repo = backend.create_repo(commits=commits)
+        commit_id1 = repo.get_commit(commit_idx=0).raw_id
+        commit_id2 = repo.get_commit(commit_idx=1).raw_id
+
+        response = self.app.get(url(
+            controller='files', action='diff_2way',
+            repo_name=repo.repo_name,
+            diff1=commit_id1,
+            diff2=commit_id2,
+            f_path=f_path))
+
+        assert_response = AssertResponse(response)
+        if backend.alias == 'svn':
+            assert_session_flash( response,
+                ('%(file_path)s has not changed') % { 'file_path': 'file.empty' })
+        else:
+            response.mustcontain(
+                ('Side-by-side Diff r0:%s ... r1:%s') % ( repo.get_commit(commit_idx=0).short_id, repo.get_commit(commit_idx=1).short_id ))
+            response.mustcontain('id="compare"')
+            response.mustcontain((
+                "var orig1_url = '/%s/raw/%s/%s';\n"
+                "var orig2_url = '/%s/raw/%s/%s';") %
+                    ( repo.repo_name, commit_id1, f_path,
+                      repo.repo_name, commit_id2, f_path))
+
+
+    def test_empty_diff_2way_redirect_to_summary_with_alert(self, app, backend):
+        commit_id_range = {
+            'hg': (
+                '25d7e49c18b159446cadfa506a5cf8ad1cb04067',
+                '603d6c72c46d953420c89d36372f08d9f305f5dd'),
+            'git': (
+                '6fc9270775aaf5544c1deb014f4ddd60c952fcbb',
+                '03fa803d7e9fb14daa9a3089e0d1494eda75d986'),
+            'svn': (
+                '335',
+                '337'),
+        }
+        f_path = 'setup.py'
+
+        commit_ids = commit_id_range[backend.alias]
+
+        response = self.app.get(url(
+            controller='files', action='diff_2way',
+            repo_name=backend.repo_name,
+            diff2=commit_ids[0],
+            diff1=commit_ids[1],
+            f_path=f_path))
+
+        assert_response = AssertResponse(response)
+        assert_session_flash( response,
+            ('%(file_path)s has not changed') % { 'file_path': f_path })

rhodecode/tests/functional/test_home.py

@@ -22,6 +22,7 b' import json'
 
 from mock import patch
 import pytest
+from pylons import tmpl_context as c
 
 import rhodecode
 from rhodecode.lib.utils import map_groups
@@ -49,6 +50,14 b' class TestHomeController(TestController)'
         for repo in Repository.getAll():
             response.mustcontain('"name_raw": "%s"' % repo.repo_name)
 
+    def test_index_contains_statics_with_ver(self):
+        self.log_user()
+        response = self.app.get(url(controller='home', action='index'))
+
+        rhodecode_version_hash = c.rhodecode_version_hash
+        response.mustcontain('style.css?ver={0}'.format(rhodecode_version_hash))
+        response.mustcontain('scripts.js?ver={0}'.format(rhodecode_version_hash))
+
     def test_index_contains_backend_specific_details(self, backend):
         self.log_user()
         response = self.app.get(url(controller='home', action='index'))

rhodecode/tests/functional/test_summary.py

@@ -19,13 +19,11 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import re
-import os
 
 import mock
 import pytest
 
 from rhodecode.controllers import summary
-from rhodecode.lib import vcs
 from rhodecode.lib import helpers as h
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
@@ -34,9 +32,9 b' from rhodecode.model.meta import Session'
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import ScmModel
 from rhodecode.tests import (
-    TestController, url, HG_REPO, assert_session_flash, TESTS_TMP_PATH)
+    TestController, url, HG_REPO, assert_session_flash)
 from rhodecode.tests.fixture import Fixture
-from rhodecode.tests.utils import AssertResponse
+from rhodecode.tests.utils import AssertResponse, repo_on_filesystem
 
 
 fixture = Fixture()
@@ -302,20 +300,23 b' class TestCreateReferenceData:'
         repo = mock.Mock()
         repo.name = 'test-repo'
         repo.alias = 'git'
+        full_repo_name = 'pytest-repo-group/' + repo.name
         controller = summary.SummaryController()
 
-        result = controller._create_reference_data(repo, example_refs)
+        result = controller._create_reference_data(
+            repo, full_repo_name, example_refs)
 
+        expected_files_url = '/{}/files/'.format(full_repo_name)
         expected_result = [
             {
                 'children': [
                     {
                         'id': 'a', 'raw_id': 'a_id', 'text': 'a', 'type': 't1',
-                        'files_url': '/test-repo/files/a/?at=a'
+                        'files_url': expected_files_url + 'a/?at=a',
                     },
                     {
                         'id': 'b', 'raw_id': 'b_id', 'text': 'b', 'type': 't1',
-                        'files_url': '/test-repo/files/b/?at=b'
+                        'files_url': expected_files_url + 'b/?at=b',
                     }
                 ],
                 'text': 'section_1'
@@ -324,7 +325,7 b' class TestCreateReferenceData:'
                 'children': [
                     {
                         'id': 'c', 'raw_id': 'c_id', 'text': 'c', 'type': 't2',
-                        'files_url': '/test-repo/files/c/?at=c'
+                        'files_url': expected_files_url + 'c/?at=c',
                     }
                 ],
                 'text': 'section_2'
@@ -335,21 +336,24 b' class TestCreateReferenceData:'
         repo = mock.Mock()
         repo.name = 'test-repo'
         repo.alias = 'svn'
+        full_repo_name = 'pytest-repo-group/' + repo.name
         controller = summary.SummaryController()
-        result = controller._create_reference_data(repo, example_refs)
+        result = controller._create_reference_data(
+            repo, full_repo_name, example_refs)
 
+        expected_files_url = '/{}/files/'.format(full_repo_name)
         expected_result = [
             {
                 'children': [
                     {
                         'id': 'a@a_id', 'raw_id': 'a_id',
                         'text': 'a', 'type': 't1',
-                        'files_url': '/test-repo/files/a_id/a?at=a'
+                        'files_url': expected_files_url + 'a_id/a?at=a',
                     },
                     {
                         'id': 'b@b_id', 'raw_id': 'b_id',
                         'text': 'b', 'type': 't1',
-                        'files_url': '/test-repo/files/b_id/b?at=b'
+                        'files_url': expected_files_url + 'b_id/b?at=b',
                     }
                 ],
                 'text': 'section_1'
@@ -359,7 +363,7 b' class TestCreateReferenceData:'
                     {
                         'id': 'c@c_id', 'raw_id': 'c_id',
                         'text': 'c', 'type': 't2',
-                        'files_url': '/test-repo/files/c_id/c?at=c'
+                        'files_url': expected_files_url + 'c_id/c?at=c',
                     }
                 ],
                 'text': 'section_2'
@@ -394,44 +398,38 b' class TestRepoLocation:'
             response, 'The repository at %s cannot be located.' % repo_name)
 
 
-def repo_on_filesystem(repo_name):
-    try:
-        vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name))
-        return True
-    except Exception:
-        return False
-
-
 class TestCreateFilesUrl(object):
     def test_creates_non_svn_url(self):
         controller = summary.SummaryController()
         repo = mock.Mock()
         repo.name = 'abcde'
+        full_repo_name = 'test-repo-group/' + repo.name
         ref_name = 'branch1'
         raw_id = 'deadbeef0123456789'
         is_svn = False
 
         with mock.patch.object(summary.h, 'url') as url_mock:
             result = controller._create_files_url(
-                repo, ref_name, raw_id, is_svn)
+                repo, full_repo_name, ref_name, raw_id, is_svn)
         url_mock.assert_called_once_with(
-            'files_home', repo_name=repo.name, f_path='', revision=ref_name,
-            at=ref_name)
+            'files_home', repo_name=full_repo_name, f_path='',
+            revision=ref_name, at=ref_name)
         assert result == url_mock.return_value
 
     def test_creates_svn_url(self):
         controller = summary.SummaryController()
         repo = mock.Mock()
         repo.name = 'abcde'
+        full_repo_name = 'test-repo-group/' + repo.name
         ref_name = 'branch1'
         raw_id = 'deadbeef0123456789'
         is_svn = True
 
         with mock.patch.object(summary.h, 'url') as url_mock:
             result = controller._create_files_url(
-                repo, ref_name, raw_id, is_svn)
+                repo, full_repo_name, ref_name, raw_id, is_svn)
         url_mock.assert_called_once_with(
-            'files_home', repo_name=repo.name, f_path=ref_name,
+            'files_home', repo_name=full_repo_name, f_path=ref_name,
             revision=raw_id, at=ref_name)
         assert result == url_mock.return_value
 
@@ -439,21 +437,24 b' class TestCreateFilesUrl(object):'
         controller = summary.SummaryController()
         repo = mock.Mock()
         repo.name = 'abcde'
+        full_repo_name = 'test-repo-group/' + repo.name
         ref_name = 'branch1/branch2'
         raw_id = 'deadbeef0123456789'
         is_svn = False
 
         with mock.patch.object(summary.h, 'url') as url_mock:
             result = controller._create_files_url(
-                repo, ref_name, raw_id, is_svn)
+                repo, full_repo_name, ref_name, raw_id, is_svn)
         url_mock.assert_called_once_with(
-            'files_home', repo_name=repo.name, f_path='', revision=raw_id,
+            'files_home', repo_name=full_repo_name, f_path='', revision=raw_id,
             at=ref_name)
         assert result == url_mock.return_value
 
 
 class TestReferenceItems(object):
     repo = mock.Mock()
+    repo.name = 'pytest-repo'
+    repo_full_name = 'pytest-repo-group/' + repo.name
     ref_type = 'branch'
     fake_url = '/abcde/'
 
@@ -477,7 +478,8 b' class TestReferenceItems(object):'
 
         with url_patcher as url_mock, svn_patcher:
             result = controller._create_reference_items(
-                self.repo, refs, self.ref_type, self._format_function)
+                self.repo, self.repo_full_name, refs, self.ref_type,
+                self._format_function)
         assert len(result) == amount
         assert url_mock.call_count == amount
 
@@ -496,9 +498,11 b' class TestReferenceItems(object):'
 
         with url_patcher as url_mock, svn_patcher:
             result = controller._create_reference_items(
-                self.repo, refs, self.ref_type, self._format_function)
+                self.repo, self.repo_full_name, refs, self.ref_type,
+                self._format_function)
 
-        url_mock.assert_called_once_with(self.repo, ref_name, ref_id, False)
+        url_mock.assert_called_once_with(
+            self.repo, self.repo_full_name, ref_name, ref_id, False)
         expected_result = [
             {
                 'text': ref_name,

rhodecode/tests/lib/middleware/test_simplegit.py

@@ -58,9 +58,10 b' def get_environ(url):'
         # Edge case: not a smart protocol url
         ('/foo/bar', 'pull'),
     ])
-def test_get_action(url, expected_action):
+def test_get_action(url, expected_action, pylonsapp):
     app = simplegit.SimpleGit(application=None,
-                              config={'auth_ret_code': '', 'base_path': ''})
+                              config={'auth_ret_code': '', 'base_path': ''},
+                              registry=None)
     assert expected_action == app._get_action(get_environ(url))
 
 
@@ -74,15 +75,17 b' def test_get_action(url, expected_action'
         ('/foo/bar/git-upload-pack', 'foo/bar'),
         ('/foo/bar/git-receive-pack', 'foo/bar'),
     ])
-def test_get_repository_name(url, expected_repo_name):
+def test_get_repository_name(url, expected_repo_name, pylonsapp):
     app = simplegit.SimpleGit(application=None,
-                              config={'auth_ret_code': '', 'base_path': ''})
+                              config={'auth_ret_code': '', 'base_path': ''},
+                              registry=None)
     assert expected_repo_name == app._get_repository_name(get_environ(url))
 
 
-def test_get_config():
+def test_get_config(pylonsapp):
     app = simplegit.SimpleGit(application=None,
-                              config={'auth_ret_code': '', 'base_path': ''})
+                              config={'auth_ret_code': '', 'base_path': ''},
+                              registry=None)
     extras = {'foo': 'FOO', 'bar': 'BAR'}
 
     # We copy the extras as the method below will change the contents.
@@ -95,13 +98,13 b' def test_get_config():'
     assert config == expected_config
 
 
-def test_create_wsgi_app_uses_scm_app_from_simplevcs():
+def test_create_wsgi_app_uses_scm_app_from_simplevcs(pylonsapp):
     config = {
         'auth_ret_code': '',
         'base_path': '',
         'vcs.scm_app_implementation':
             'rhodecode.tests.lib.middleware.mock_scm_app',
     }
-    app = simplegit.SimpleGit(application=None, config=config)
+    app = simplegit.SimpleGit(application=None, config=config, registry=None)
     wsgi_app = app._create_wsgi_app('/tmp/test', 'test_repo', {})
     assert wsgi_app is mock_scm_app.mock_git_wsgi

rhodecode/tests/lib/middleware/test_simplehg.py

@@ -55,7 +55,8 b' def get_environ(url):'
     ])
 def test_get_action(url, expected_action):
     app = simplehg.SimpleHg(application=None,
-                            config={'auth_ret_code': '', 'base_path': ''})
+                            config={'auth_ret_code': '', 'base_path': ''},
+                            registry=None)
     assert expected_action == app._get_action(get_environ(url))
 
 
@@ -72,13 +73,15 b' def test_get_action(url, expected_action'
     ])
 def test_get_repository_name(url, expected_repo_name):
     app = simplehg.SimpleHg(application=None,
-                            config={'auth_ret_code': '', 'base_path': ''})
+                            config={'auth_ret_code': '', 'base_path': ''},
+                            registry=None)
     assert expected_repo_name == app._get_repository_name(get_environ(url))
 
 
 def test_get_config():
     app = simplehg.SimpleHg(application=None,
-                            config={'auth_ret_code': '', 'base_path': ''})
+                            config={'auth_ret_code': '', 'base_path': ''},
+                            registry=None)
     extras = {'foo': 'FOO', 'bar': 'BAR'}
 
     mock_config = Config()
@@ -108,6 +111,6 b' def test_create_wsgi_app_uses_scm_app_fr'
         'vcs.scm_app_implementation':
             'rhodecode.tests.lib.middleware.mock_scm_app',
     }
-    app = simplehg.SimpleHg(application=None, config=config)
+    app = simplehg.SimpleHg(application=None, config=config, registry=None)
     wsgi_app = app._create_wsgi_app('/tmp/test', 'test_repo', {})
     assert wsgi_app is mock_scm_app.mock_hg_wsgi

rhodecode/tests/lib/middleware/test_simplesvn.py

@@ -33,7 +33,8 b' class TestSimpleSvn(object):'
         self.app = SimpleSvn(
             application='None',
             config={'auth_ret_code': '',
-                    'base_path': rhodecode.CONFIG['base_path']})
+                    'base_path': rhodecode.CONFIG['base_path']},
+            registry=None)
 
     def test_get_config(self):
         extras = {'foo': 'FOO', 'bar': 'BAR'}
@@ -140,7 +141,8 b' class TestSimpleSvnApp(object):'
         }
         expected_headers = [
             ('MS-Author-Via', 'DAV'),
-            ('SVN-Supported-Posts', 'create-txn-with-props')
+            ('SVN-Supported-Posts', 'create-txn-with-props'),
+            ('X-RhodeCode-Backend', 'svn'),
         ]
         response_headers = self.app._get_response_headers(headers)
         assert sorted(response_headers) == sorted(expected_headers)
@@ -174,7 +176,8 b' class TestSimpleSvnApp(object):'
         }
         expected_response_headers = [
             ('SVN-Supported-Posts', 'create-txn-with-props'),
-            ('MS-Author-Via', 'DAV')
+            ('MS-Author-Via', 'DAV'),
+            ('X-RhodeCode-Backend', 'svn'),
         ]
         request_mock.assert_called_once_with(
             self.environment['REQUEST_METHOD'], expected_url,

rhodecode/tests/lib/middleware/test_simplevcs.py

@@ -25,9 +25,7 b' import pytest'
 import webtest.app
 
 from rhodecode.lib.caching_query import FromCache
-from rhodecode.lib.hooks_daemon import (
-    Pyro4HooksCallbackDaemon, DummyHooksCallbackDaemon,
-    HttpHooksCallbackDaemon)
+from rhodecode.lib.hooks_daemon import DummyHooksCallbackDaemon
 from rhodecode.lib.middleware import simplevcs
 from rhodecode.lib.middleware.https_fixup import HttpsFixup
 from rhodecode.lib.middleware.utils import scm_app
@@ -66,7 +64,7 b' def vcscontroller(pylonsapp, config_stub'
     config_stub.include('rhodecode.authentication')
 
     set_anonymous_access(True)
-    controller = StubVCSController(pylonsapp, pylonsapp.config)
+    controller = StubVCSController(pylonsapp, pylonsapp.config, None)
     app = HttpsFixup(controller, pylonsapp.config)
     app = webtest.app.TestApp(app)
 
@@ -131,7 +129,7 b' class StubFailVCSController(simplevcs.Si'
 
 @pytest.fixture(scope='module')
 def fail_controller(pylonsapp):
-    controller = StubFailVCSController(pylonsapp, pylonsapp.config)
+    controller = StubFailVCSController(pylonsapp, pylonsapp.config, None)
     controller = HttpsFixup(controller, pylonsapp.config)
     controller = webtest.app.TestApp(controller)
     return controller
@@ -148,7 +146,7 b' def test_provides_traceback_for_appenlig'
 
 
 def test_provides_utils_scm_app_as_scm_app_by_default(pylonsapp):
-    controller = StubVCSController(pylonsapp, pylonsapp.config)
+    controller = StubVCSController(pylonsapp, pylonsapp.config, None)
     assert controller.scm_app is scm_app
 
 
@@ -156,7 +154,7 b' def test_allows_to_override_scm_app_via_'
     config = pylonsapp.config.copy()
     config['vcs.scm_app_implementation'] = (
         'rhodecode.tests.lib.middleware.mock_scm_app')
-    controller = StubVCSController(pylonsapp, config)
+    controller = StubVCSController(pylonsapp, config, None)
     assert controller.scm_app is mock_scm_app
 
 
@@ -231,7 +229,12 b' class TestGenerateVcsResponse:'
         assert prepare_mock.call_count == 1
 
     def call_controller_with_response_body(self, response_body):
-        controller = StubVCSController(None, {'base_path': 'fake_base_path'})
+        settings = {
+            'base_path': 'fake_base_path',
+            'vcs.hooks.protocol': 'http',
+            'vcs.hooks.direct_calls': False,
+        }
+        controller = StubVCSController(None, settings, None)
         controller._invalidate_cache = mock.Mock()
         controller.stub_response_body = response_body
         self.start_response = mock.Mock()
@@ -281,16 +284,11 b' class TestInitializeGenerator:'
 
 
 class TestPrepareHooksDaemon(object):
-    def test_calls_imported_prepare_callback_daemon(self):
-        config = {
-            'base_path': 'fake_base_path',
-            'vcs.hooks.direct_calls': False,
-            'vcs.hooks.protocol': 'http'
-        }
+    def test_calls_imported_prepare_callback_daemon(self, app_settings):
         expected_extras = {'extra1': 'value1'}
         daemon = DummyHooksCallbackDaemon()
 
-        controller = StubVCSController(None, config)
+        controller = StubVCSController(None, app_settings, None)
         prepare_patcher = mock.patch.object(
             simplevcs, 'prepare_callback_daemon',
             return_value=(daemon, expected_extras))
@@ -298,7 +296,9 b' class TestPrepareHooksDaemon(object):'
             callback_daemon, extras = controller._prepare_callback_daemon(
                 expected_extras.copy())
         prepare_mock.assert_called_once_with(
-            expected_extras, protocol='http', use_direct_calls=False)
+            expected_extras,
+            protocol=app_settings['vcs.hooks.protocol'],
+            use_direct_calls=app_settings['vcs.hooks.direct_calls'])
 
         assert callback_daemon == daemon
         assert extras == extras

rhodecode/tests/lib/middleware/test_vcs.py

@@ -26,7 +26,7 b' from rhodecode.lib.middleware import vcs'
 
 def test_is_hg():
     environ = {
-        'PATH_INFO': 'rhodecode-dev',
+        'PATH_INFO': '/rhodecode-dev',
         'QUERY_STRING': 'cmd=changegroup',
         'HTTP_ACCEPT': 'application/mercurial'
     }
@@ -35,7 +35,7 b' def test_is_hg():'
 
 def test_is_hg_no_cmd():
     environ = {
-        'PATH_INFO': 'rhodecode-dev',
+        'PATH_INFO': '/rhodecode-dev',
         'QUERY_STRING': '',
         'HTTP_ACCEPT': 'application/mercurial'
     }
@@ -44,7 +44,7 b' def test_is_hg_no_cmd():'
 
 def test_is_hg_empty_cmd():
     environ = {
-        'PATH_INFO': 'rhodecode-dev',
+        'PATH_INFO': '/rhodecode-dev',
         'QUERY_STRING': 'cmd=',
         'HTTP_ACCEPT': 'application/mercurial'
     }
@@ -53,7 +53,7 b' def test_is_hg_empty_cmd():'
 
 def test_is_svn_returns_true_if_subversion_is_in_a_dav_header():
     environ = {
-        'PATH_INFO': 'rhodecode-dev',
+        'PATH_INFO': '/rhodecode-dev',
         'HTTP_DAV': 'http://subversion.tigris.org/xmlns/dav/svn/log-revprops'
     }
     assert vcs.is_svn(environ) is True
@@ -61,7 +61,7 b' def test_is_svn_returns_true_if_subversi'
 
 def test_is_svn_returns_false_if_subversion_is_not_in_a_dav_header():
     environ = {
-        'PATH_INFO': 'rhodecode-dev',
+        'PATH_INFO': '/rhodecode-dev',
         'HTTP_DAV': 'http://stuff.tigris.org/xmlns/dav/svn/log-revprops'
     }
     assert vcs.is_svn(environ) is False
@@ -69,11 +69,31 b' def test_is_svn_returns_false_if_subvers'
 
 def test_is_svn_returns_false_if_no_dav_header():
     environ = {
-        'PATH_INFO': 'rhodecode-dev',
+        'PATH_INFO': '/rhodecode-dev',
     }
     assert vcs.is_svn(environ) is False
 
 
+def test_is_svn_returns_true_if_magic_path_segment():
+    environ = {
+        'PATH_INFO': '/stub-repository/!svn/rev/4',
+    }
+    assert vcs.is_svn(environ)
+
+
+def test_is_svn_allows_to_configure_the_magic_path(monkeypatch):
+    """
+    This is intended as a fallback in case someone has configured his
+    Subversion server with a different magic path segment.
+    """
+    monkeypatch.setitem(
+        rhodecode.CONFIG, 'rhodecode_subversion_magic_path', '/!my-magic')
+    environ = {
+        'PATH_INFO': '/stub-repository/!my-magic/rev/4',
+    }
+    assert vcs.is_svn(environ)
+
+
 class TestVCSMiddleware(object):
     def test_get_handler_app_retuns_svn_app_when_proxy_enabled(self):
         environ = {
@@ -82,8 +102,9 b' class TestVCSMiddleware(object):'
         }
         app = Mock()
         config = Mock()
+        registry = Mock()
         middleware = vcs.VCSMiddleware(
-            app, config=config, appenlight_client=None)
+            app, config=config, appenlight_client=None, registry=registry)
         snv_patch = patch('rhodecode.lib.middleware.vcs.SimpleSvn')
         settings_patch = patch.dict(
             rhodecode.CONFIG,
@@ -92,7 +113,7 b' class TestVCSMiddleware(object):'
             svn_mock.return_value = None
             middleware._get_handler_app(environ)
 
-        svn_mock.assert_called_once_with(app, config)
+        svn_mock.assert_called_once_with(app, config, registry)
 
     def test_get_handler_app_retuns_no_svn_app_when_proxy_disabled(self):
         environ = {
@@ -101,8 +122,9 b' class TestVCSMiddleware(object):'
         }
         app = Mock()
         config = Mock()
+        registry = Mock()
         middleware = vcs.VCSMiddleware(
-            app, config=config, appenlight_client=None)
+            app, config=config, appenlight_client=None, registry=registry)
         snv_patch = patch('rhodecode.lib.middleware.vcs.SimpleSvn')
         settings_patch = patch.dict(
             rhodecode.CONFIG,

rhodecode/tests/lib/middleware/utils/test_scm_app_http.py

@@ -33,7 +33,7 b' def vcs_http_app(vcsserver_http_echo_app'
     """
     git_url = vcsserver_http_echo_app.http_url + 'stream/git/'
     vcs_http_proxy = scm_app_http.VcsHttpProxy(
-        git_url, 'stub_path', 'stub_name', None)
+        git_url, 'stub_path', 'stub_name', None, 'stub_backend')
     app = webtest.TestApp(vcs_http_proxy)
     return app
 

rhodecode/tests/lib/middleware/utils/test_scm_app_http_chunking.py

@@ -133,4 +133,4 b' def create_scm_app():'
     """
     echo_app_url = os.environ["RC_ECHO_URL"]
     return scm_app_http.VcsHttpProxy(
-        echo_app_url, 'stub_path', 'stub_name', None)
+        echo_app_url, 'stub_path', 'stub_name', None, 'stub_backend')

rhodecode/tests/lib/test_diffs.py

@@ -86,8 +86,10 b' def test_diffprocessor_as_html_with_comm'
         </tr>
         <tr class="line unmod">
             <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
-            <td id="setuppy_o2" class="lineno old"><a href="#setuppy_o2">2</a></td>
-            <td id="setuppy_n2" class="lineno new"><a href="#setuppy_n2">2</a></td>
+            <td id="setuppy_o2" class="lineno old"><a href="#setuppy_o2" class="tooltip"
+                        title="Click to select line">2</a></td>
+            <td id="setuppy_n2" class="lineno new"><a href="#setuppy_n2" class="tooltip"
+                        title="Click to select line">2</a></td>
             <td class="code">
                 <pre>#!/usr/bin/python
         </pre>
@@ -95,8 +97,10 b' def test_diffprocessor_as_html_with_comm'
         </tr>
         <tr class="line unmod">
             <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
-            <td id="setuppy_o3" class="lineno old"><a href="#setuppy_o3">3</a></td>
-            <td id="setuppy_n3" class="lineno new"><a href="#setuppy_n3">3</a></td>
+            <td id="setuppy_o3" class="lineno old"><a href="#setuppy_o3" class="tooltip"
+                        title="Click to select line">3</a></td>
+            <td id="setuppy_n3" class="lineno new"><a href="#setuppy_n3" class="tooltip"
+                        title="Click to select line">3</a></td>
             <td class="code">
                 <pre># Setup file for X
         </pre>
@@ -104,8 +108,10 b' def test_diffprocessor_as_html_with_comm'
         </tr>
         <tr class="line unmod">
             <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
-            <td id="setuppy_o4" class="lineno old"><a href="#setuppy_o4">4</a></td>
-            <td id="setuppy_n4" class="lineno new"><a href="#setuppy_n4">4</a></td>
+            <td id="setuppy_o4" class="lineno old"><a href="#setuppy_o4" class="tooltip"
+                        title="Click to select line">4</a></td>
+            <td id="setuppy_n4" class="lineno new"><a href="#setuppy_n4" class="tooltip"
+                        title="Click to select line">4</a></td>
             <td class="code">
                 <pre># Copyright (C) No one
         </pre>
@@ -113,8 +119,10 b' def test_diffprocessor_as_html_with_comm'
         </tr>
         <tr class="line del">
             <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
-            <td id="setuppy_o5" class="lineno old"><a href="#setuppy_o5">5</a></td>
-            <td  class="lineno new"><a href="#setuppy_n"></a></td>
+            <td id="setuppy_o5" class="lineno old"><a href="#setuppy_o5" class="tooltip"
+                        title="Click to select line">5</a></td>
+            <td  class="lineno new"><a href="#setuppy_n" class="tooltip"
+                        title="Click to select line"></a></td>
             <td class="code">
                 <pre>
         </pre>
@@ -122,8 +130,10 b' def test_diffprocessor_as_html_with_comm'
         </tr>
         <tr class="line add">
             <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
-            <td  class="lineno old"><a href="#setuppy_o"></a></td>
-            <td id="setuppy_n5" class="lineno new"><a href="#setuppy_n5">5</a></td>
+            <td  class="lineno old"><a href="#setuppy_o" class="tooltip"
+                        title="Click to select line"></a></td>
+            <td id="setuppy_n5" class="lineno new"><a href="#setuppy_n5" class="tooltip"
+                        title="Click to select line">5</a></td>
             <td class="code">
                 <pre><ins>x</ins>
         </pre>
@@ -131,8 +141,10 b' def test_diffprocessor_as_html_with_comm'
         </tr>
         <tr class="line unmod">
             <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
-            <td id="setuppy_o6" class="lineno old"><a href="#setuppy_o6">6</a></td>
-            <td id="setuppy_n6" class="lineno new"><a href="#setuppy_n6">6</a></td>
+            <td id="setuppy_o6" class="lineno old"><a href="#setuppy_o6" class="tooltip"
+                        title="Click to select line">6</a></td>
+            <td id="setuppy_n6" class="lineno new"><a href="#setuppy_n6" class="tooltip"
+                        title="Click to select line">6</a></td>
             <td class="code">
                 <pre>try:
         </pre>
@@ -140,8 +152,10 b' def test_diffprocessor_as_html_with_comm'
         </tr>
         <tr class="line unmod">
             <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
-            <td id="setuppy_o7" class="lineno old"><a href="#setuppy_o7">7</a></td>
-            <td id="setuppy_n7" class="lineno new"><a href="#setuppy_n7">7</a></td>
+            <td id="setuppy_o7" class="lineno old"><a href="#setuppy_o7" class="tooltip"
+                        title="Click to select line">7</a></td>
+            <td id="setuppy_n7" class="lineno new"><a href="#setuppy_n7" class="tooltip"
+                        title="Click to select line">7</a></td>
             <td class="code">
                 <pre>    from setuptools import setup, Extension
         </pre>
@@ -149,8 +163,10 b' def test_diffprocessor_as_html_with_comm'
         </tr>
         <tr class="line unmod">
             <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
-            <td id="setuppy_o8" class="lineno old"><a href="#setuppy_o8">8</a></td>
-            <td id="setuppy_n8" class="lineno new"><a href="#setuppy_n8">8</a></td>
+            <td id="setuppy_o8" class="lineno old"><a href="#setuppy_o8" class="tooltip"
+                        title="Click to select line">8</a></td>
+            <td id="setuppy_n8" class="lineno new"><a href="#setuppy_n8" class="tooltip"
+                        title="Click to select line">8</a></td>
             <td class="code">
                 <pre>except ImportError:
         </pre>

rhodecode/tests/lib/test_helpers.py

@@ -69,6 +69,40 b' def test_format_binary():'
     assert helpers.format_byte_size_binary(298489462784) == '278.0 GiB'
 
 
[e-mail]('text_string, pattern, expected', [
+    ('No issue here', '(?:#)(?P<issue_id>\d+)', []),
+    ('Fix #42', '(?:#)(?P<issue_id>\d+)',
+     [{'url': 'http://r.io/{repo}/i/42', 'id': '42'}]),
+    ('Fix #42, #53', '(?:#)(?P<issue_id>\d+)', [
+     {'url': 'http://r.io/{repo}/i/42', 'id': '42'},
+     {'url': 'http://r.io/{repo}/i/53', 'id': '53'}]),
+    ('Fix #42', '(?:#)?<issue_id>\d+)', []),  # Broken regex
+])
+def test_extract_issues(backend, text_string, pattern, expected):
+    repo = backend.create_repo()
+    config = {
+        '123': {
+            'uid': '123',
+            'pat': pattern,
+            'url': 'http://r.io/${repo}/i/${issue_id}',
+            'pref': '#',
+        }
+    }
+
+    def get_settings_mock(self, cache=True):
+        return config
+
+    with mock.patch.object(IssueTrackerSettingsModel,
+                           'get_settings', get_settings_mock):
+        text, issues = helpers.process_patterns(text_string, repo.repo_name)
+
+    expected = copy.deepcopy(expected)
+    for item in expected:
+        item['url'] = item['url'].format(repo=repo.repo_name)
+
+    assert issues == expected
+
+
 @pytest.mark.parametrize('text_string, pattern, expected_text', [
     ('Fix #42', '(?:#)(?P<issue_id>\d+)',
      'Fix <a class="issue-tracker-link" href="http://r.io/{repo}/i/42">#42</a>'
@@ -90,7 +124,7 b' def test_process_patterns_repo(backend, '
 
     with mock.patch.object(IssueTrackerSettingsModel,
                            'get_settings', get_settings_mock):
-        processed_text = helpers.process_patterns(
+        processed_text, issues = helpers.process_patterns(
             text_string, repo.repo_name, config)
 
     assert processed_text == expected_text.format(repo=repo.repo_name)
@@ -116,7 +150,7 b' def test_process_patterns_no_repo(text_s'
 
     with mock.patch.object(IssueTrackerSettingsModel,
                            'get_global_settings', get_settings_mock):
-        processed_text = helpers.process_patterns(
+        processed_text, issues = helpers.process_patterns(
             text_string, '', config)
 
     assert processed_text == expected_text
@@ -140,7 +174,7 b' def test_process_patterns_non_existent_r'
 
     with mock.patch.object(IssueTrackerSettingsModel,
                            'get_global_settings', get_settings_mock):
-        processed_text = helpers.process_patterns(
+        processed_text, issues = helpers.process_patterns(
             text_string, 'do-not-exist', config)
 
     assert processed_text == expected_text

rhodecode/tests/lib/test_hooks_base.py

@@ -28,12 +28,12 b' from rhodecode.lib import hooks_base, ut'
     action_logger=mock.Mock(),
     post_push_extension=mock.Mock(),
     Repository=mock.Mock())
-def test_post_push_truncates_commits():
+def test_post_push_truncates_commits(user_regular, repo_stub):
     extras = {
         'ip': '127.0.0.1',
-        'username': 'test',
+        'username': user_regular.username,
         'action': 'push_local',
-        'repository': 'test',
+        'repository': repo_stub.repo_name,
         'scm': 'git',
         'config': '',
         'server_url': 'http://example.com',

rhodecode/tests/lib/test_mako_emails.py

@@ -27,9 +27,9 b' def test_render_email(pylonsapp):'
     assert body_plaintext == 'Email Plaintext Body'
 
     # body
-    assert '<b>This is a notification ' \
-           'from RhodeCode. http://test.example.com:80/</b>' in body
-    assert '<b>Email Body' in body
+    assert 'This is a notification ' \
+           'from RhodeCode. http://test.example.com:80/' in body
+    assert 'Email Body' in body
 
 
 def test_render_pr_email(pylonsapp, user_admin):

rhodecode/tests/lib/test_markup_renderer.py

@@ -177,3 +177,37 b' Auto status change to |new_status|'
     renderer = RstTemplateRenderer()
     rendered = renderer.render('auto_status_change.mako', **params)
     assert expected == rendered
+
+
[e-mail](
+    "readmes, exts, order",
+    [
+        ([], [], []),
+
+        ([('readme1', 0), ('text1', 1)], [('.ext', 0), ('.txt', 1)],
+         ['readme1.ext', 'readme1.txt', 'text1.ext', 'text1.txt']),
+
+        ([('readme2', 0), ('text2', 1)], [('.ext', 2), ('.txt', 1)],
+         ['readme2.txt', 'readme2.ext', 'text2.txt', 'text2.ext']),
+
+        ([('readme3', 0), ('text3', 1)], [('.XXX', 1)],
+         ['readme3.XXX', 'text3.XXX']),
+    ])
+def test_generate_readmes(readmes, exts, order):
+    assert order == MarkupRenderer.generate_readmes(readmes, exts)
+
+
[e-mail](
+    "renderer, expected_order",
+    [
+        ('plain', ['readme', 'README', 'Readme']),
+        ('text', ['readme', 'README', 'Readme']),
+        ('markdown', MarkupRenderer.generate_readmes(
+            MarkupRenderer.ALL_READMES, MarkupRenderer.MARKDOWN_EXTS)),
+        ('rst', MarkupRenderer.generate_readmes(
+            MarkupRenderer.ALL_READMES, MarkupRenderer.RST_EXTS)),
+    ])
+def test_order_of_readme_generation(renderer, expected_order):
+    mkd_renderer = MarkupRenderer()
+    assert expected_order == mkd_renderer.pick_readme_order(
+        renderer)[:len(expected_order)]

rhodecode/tests/lib/test_utils2.py

@@ -18,9 +18,41 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-from rhodecode.lib.utils2 import obfuscate_url_pw
+import pytest
+
+from rhodecode.lib.utils2 import (
+    obfuscate_url_pw, get_routes_generator_for_server_url)
 
 
 def test_obfuscate_url_pw():
     engine = u'/home/repos/malmö'
     assert obfuscate_url_pw(engine)
+
+
[e-mail]('scheme', ['https', 'http'])
[e-mail]('domain', [
+    'www.test.com', 'test.com', 'test.co.uk', '192.168.1.3'])
[e-mail]('port', [None, '80', '443', '999'])
[e-mail]('script_path', [None, '/', '/prefix', '/prefix/more'])
+def test_routes_generator(pylonsapp, scheme, domain, port, script_path):
+    server_url = '%s://%s' % (scheme, domain)
+    if port is not None:
+        server_url += ':' + port
+    if script_path:
+        server_url += script_path
+
+
+    expected_url = '%s://%s' % (scheme, domain)
+    if scheme == 'https':
+        if port not in (None, '443'):
+            expected_url += ':' + port
+    elif scheme == 'http':
+        if port not in ('80', None):
+            expected_url += ':' + port
+
+    if script_path:
+        expected_url = (expected_url + script_path).rstrip('/')
+
+    url_generator = get_routes_generator_for_server_url(server_url)
+    assert url_generator(
+        '/a_test_path', qualified=True) == expected_url + '/a_test_path'

rhodecode/tests/models/schemas/test_schema_types.py

@@ -21,7 +21,7 b''
 import colander
 import pytest
 
-from rhodecode.model.validation_schema import GroupNameType
+from rhodecode.model.validation_schema.types import GroupNameType
 
 
 class TestGroupNameType(object):

rhodecode/tests/models/settings/test_vcs_settings.py

@@ -39,7 +39,8 b' SVN_FORM_DATA = {'
 
 GENERAL_FORM_DATA = {
     'rhodecode_pr_merge_enabled': True,
-    'rhodecode_use_outdated_comments': True
+    'rhodecode_use_outdated_comments': True,
+    'rhodecode_hg_use_rebase_for_merging': True,
 }
 
 

rhodecode/tests/models/test_pullrequest.py

@@ -157,7 +157,8 b' class TestPullRequestModel:'
         self.merge_mock.assert_called_once_with(
             pull_request.target_ref_parts,
             pull_request.source_repo.scm_instance(),
-            pull_request.source_ref_parts, self.workspace_id, dry_run=True)
+            pull_request.source_ref_parts, self.workspace_id, dry_run=True,
+            use_rebase=False)
 
         assert pull_request._last_merge_source_rev == self.source_commit
         assert pull_request._last_merge_target_rev == self.target_commit
@@ -185,7 +186,8 b' class TestPullRequestModel:'
         self.merge_mock.assert_called_once_with(
             pull_request.target_ref_parts,
             pull_request.source_repo.scm_instance(),
-            pull_request.source_ref_parts, self.workspace_id, dry_run=True)
+            pull_request.source_ref_parts, self.workspace_id, dry_run=True,
+            use_rebase=False)
 
         assert pull_request._last_merge_source_rev == self.source_commit
         assert pull_request._last_merge_target_rev == self.target_commit
@@ -216,7 +218,8 b' class TestPullRequestModel:'
         self.merge_mock.assert_called_once_with(
             pull_request.target_ref_parts,
             pull_request.source_repo.scm_instance(),
-            pull_request.source_ref_parts, self.workspace_id, dry_run=True)
+            pull_request.source_ref_parts, self.workspace_id, dry_run=True,
+            use_rebase=False)
 
         assert pull_request._last_merge_source_rev is None
         assert pull_request._last_merge_target_rev is None
@@ -271,6 +274,7 b' class TestPullRequestModel:'
             '6126b7bfcc82ad2d3deaee22af926b082ce54cc6',
             MergeFailureReason.NONE)
 
+        merge_extras['repository'] = pull_request.target_repo.repo_name
         PullRequestModel().merge(
             pull_request, pull_request.author, extras=merge_extras)
 
@@ -288,7 +292,8 b' class TestPullRequestModel:'
             pull_request.target_ref_parts,
             pull_request.source_repo.scm_instance(),
             pull_request.source_ref_parts, self.workspace_id,
-            user_name=user.username, user_email=user.email, message=message
+            user_name=user.username, user_email=user.email, message=message,
+            use_rebase=False
         )
         self.invalidation_mock.assert_called_once_with(
             pull_request.target_repo.repo_name)
@@ -308,6 +313,7 b' class TestPullRequestModel:'
             '6126b7bfcc82ad2d3deaee22af926b082ce54cc6',
             MergeFailureReason.MERGE_FAILED)
 
+        merge_extras['repository'] = pull_request.target_repo.repo_name
         PullRequestModel().merge(
             pull_request, pull_request.author, extras=merge_extras)
 
@@ -325,7 +331,8 b' class TestPullRequestModel:'
             pull_request.target_ref_parts,
             pull_request.source_repo.scm_instance(),
             pull_request.source_ref_parts, self.workspace_id,
-            user_name=user.username, user_email=user.email, message=message
+            user_name=user.username, user_email=user.email, message=message,
+            use_rebase=False
         )
 
         pull_request = PullRequest.get(pull_request.pull_request_id)
@@ -364,6 +371,7 b' class TestIntegrationMerge(object):'
         pull_request = pr_util.create_pull_request(
             approved=True, mergeable=True)
         # TODO: johbo: Needed for sqlite, try to find an automatic way for it
+        merge_extras['repository'] = pull_request.target_repo.repo_name
         Session().commit()
 
         with mock.patch.dict(rhodecode.CONFIG, extra_config, clear=False):
@@ -379,6 +387,7 b' class TestIntegrationMerge(object):'
         pull_request = pr_util.create_pull_request(
             approved=True, mergeable=True)
         # TODO: johbo: Needed for sqlite, try to find an automatic way for it
+        merge_extras['repository'] = pull_request.target_repo.repo_name
         Session().commit()
 
         with mock.patch('rhodecode.EXTENSIONS.PRE_PUSH_HOOK') as pre_pull:
@@ -400,6 +409,7 b' class TestIntegrationMerge(object):'
         # all data is pre-computed, that's why just updating the DB is not
         # enough.
         merge_extras['locked_by'] = locked_by
+        merge_extras['repository'] = pull_request.target_repo.repo_name
         # TODO: johbo: Needed for sqlite, try to find an automatic way for it
         Session().commit()
         merge_status = PullRequestModel().merge(

rhodecode/tests/models/test_repos.py

@@ -160,7 +160,8 b' class TestRepoModel:'
         with mock.patch('rhodecode.model.db.Repository.scm_instance') as scm:
             scm_instance = mock.Mock()
             scm_instance.get_commit.return_value = {
-                'raw_id': 40*'0'
+                'raw_id': 40*'0',
+                'revision': 1
             }
             scm.return_value = scm_instance
             repo.update_commit_cache()

rhodecode/tests/models/test_scm.py

@@ -51,7 +51,7 b' def test_scm_instance_config(backend):'
 def test__get_instance_config(backend):
     repo = backend.create_repo()
     vcs_class = Mock()
-    with patch.multiple('rhodecode.model.db',
+    with patch.multiple('rhodecode.lib.vcs.backends',
                         get_scm=DEFAULT,
                         get_backend=DEFAULT) as mocks:
         mocks['get_scm'].return_value = backend.alias
@@ -59,13 +59,13 b' def test__get_instance_config(backend):'
         with patch('rhodecode.model.db.Repository._config') as config_mock:
             repo._get_instance()
             vcs_class.assert_called_with(
-                repo.repo_full_path, config=config_mock, create=False,
-                with_wire={'cache': True})
+                repo_path=repo.repo_full_path, config=config_mock,
+                create=False, with_wire={'cache': True})
 
         new_config = {'override': 'old_config'}
         repo._get_instance(config=new_config)
         vcs_class.assert_called_with(
-            repo.repo_full_path, config=new_config, create=False,
+            repo_path=repo.repo_full_path, config=new_config, create=False,
             with_wire={'cache': True})
 
 
@@ -77,6 +77,19 b' def test_mark_for_invalidation_config(ba'
         assert kwargs['config'].__dict__ == repo._config.__dict__
 
 
+def test_mark_for_invalidation_with_delete_updates_last_commit(backend):
+    commits = [{'message': 'A'}, {'message': 'B'}]
+    repo = backend.create_repo(commits=commits)
+    scm.ScmModel().mark_for_invalidation(repo.repo_name, delete=True)
+    assert repo.changeset_cache['revision'] == 1
+
+
+def test_mark_for_invalidation_with_delete_updates_last_commit_empty(backend):
+    repo = backend.create_repo()
+    scm.ScmModel().mark_for_invalidation(repo.repo_name, delete=True)
+    assert repo.changeset_cache['revision'] == -1
+
+
 def test_strip_with_multiple_heads(backend_hg):
     commits = [
         {'message': 'A'},
@@ -135,6 +148,23 b' def test_get_nodes_returns_unicode_non_f'
     assert_contains_only_unicode([f['name'] for f in files])
 
 
+def test_get_nodes_max_file_bytes(backend_random):
+    repo = backend_random.repo
+    max_file_bytes = 10
+    directories, files = scm.ScmModel().get_nodes(
+        repo.repo_name, repo.get_commit(commit_idx=0).raw_id, content=True,
+        extended_info=True, flat=False)
+    assert any(file['content'] and len(file['content']) > max_file_bytes
+               for file in files)
+
+    directories, files = scm.ScmModel().get_nodes(
+        repo.repo_name, repo.get_commit(commit_idx=0).raw_id, content=True,
+        extended_info=True, flat=False, max_file_bytes=max_file_bytes)
+    assert all(
+        file['content'] is None if file['size'] > max_file_bytes else True
+        for file in files)
+
+
 def assert_contains_only_unicode(structure):
     assert structure
     for value in structure:

rhodecode/tests/other/vcs_operations/__init__.py

@@ -87,18 +87,21 b' def _add_files_and_push(vcs, dest, clone'
     added_file = jn(path, '%ssetup.py' % tempfile._RandomNameSequence().next())
     Command(cwd).execute('touch %s' % added_file)
     Command(cwd).execute('%s add %s' % (vcs, added_file))
+    author_str = 'Marcin Kuźminski <[e-mail]>'
+
+    git_ident = "git config user.name {} && git config user.email {}".format(
+            'Marcin Kuźminski', '[e-mail]')
 
     for i in xrange(kwargs.get('files_no', 3)):
         cmd = """echo 'added_line%s' >> %s""" % (i, added_file)
         Command(cwd).execute(cmd)
-        author_str = 'Marcin Kuźminski <[e-mail]>'
         if vcs == 'hg':
             cmd = """hg commit -m 'commited new %s' -u '%s' %s """ % (
                 i, author_str, added_file
             )
         elif vcs == 'git':
-            cmd = """EMAIL="[e-mail]" git commit -m 'commited new %s' """\
-                  """--author '%s' %s """ % (i, author_str, added_file)
+            cmd = """%s && git commit -m 'commited new %s' %s""" % (
+                git_ident, i, added_file)
         Command(cwd).execute(cmd)
 
     # PUSH it back
@@ -108,7 +111,8 b' def _add_files_and_push(vcs, dest, clone'
             'hg push --verbose', clone_url)
     elif vcs == 'git':
         stdout, stderr = Command(cwd).execute(
-            'git push --verbose', clone_url + " master")
+            """%s && git push --verbose %s master""" % (
+                git_ident, clone_url))
 
     return stdout, stderr
 

rhodecode/tests/other/vcs_operations/conftest.py

@@ -217,10 +217,10 b' def enable_auth_plugins(request, pylonsa'
             plugin = rhodecode.authentication.base.loadplugin(module)
             plugin_name = plugin.name
             enabled_plugin = 'auth_%s_enabled' % plugin_name
-            cache_ttl = 'auth_%s_auth_cache_ttl' % plugin_name
+            cache_ttl = 'auth_%s_cache_ttl' % plugin_name
 
             # default params that are needed for each plugin,
-            # `enabled` and `auth_cache_ttl`
+            # `enabled` and `cache_ttl`
             params.update({
                 enabled_plugin: True,
                 cache_ttl: 0

rhodecode/tests/plugin.py

@@ -214,6 +214,22 b' def app(request, pylonsapp, http_environ'
     return app
 
 
[e-mail]()
+def app_settings(pylonsapp, pylons_config):
+    """
+    Settings dictionary used to create the app.
+
+    Parses the ini file and passes the result through the sanitize and apply
+    defaults mechanism in `rhodecode.config.middleware`.
+    """
+    from paste.deploy.loadwsgi import loadcontext, APP
+    from rhodecode.config.middleware import (
+        sanitize_settings_and_apply_defaults)
+    context = loadcontext(APP, 'config:' + pylons_config)
+    settings = sanitize_settings_and_apply_defaults(context.config())
+    return settings
+
+
 LoginData = collections.namedtuple('LoginData', ('csrf_token', 'user'))
 
 
@@ -285,6 +301,27 b' def tests_tmp_path(request):'
     return TESTS_TMP_PATH
 
 
[e-mail](scope='session', autouse=True)
+def patch_pyro_request_scope_proxy_factory(request):
+    """
+    Patch the pyro proxy factory to always use the same dummy request object
+    when under test. This will return the same pyro proxy on every call.
+    """
+    dummy_request = pyramid.testing.DummyRequest()
+
+    def mocked_call(self, request=None):
+        return self.getProxy(request=dummy_request)
+
+    patcher = mock.patch(
+        'rhodecode.lib.vcs.client.RequestScopeProxyFactory.__call__',
+        new=mocked_call)
+    patcher.start()
+
+    @request.addfinalizer
+    def undo_patching():
+        patcher.stop()
+
+
 @pytest.fixture
 def test_repo_group(request):
     """
@@ -1168,8 +1205,8 b' class UserUtility(object):'
     def _inherit_default_user_permissions(self, user_name, value):
         user = UserModel().get_by_username(user_name)
         user.inherit_default_permissions = value
-        Session.add(user)
-        Session.commit()
+        Session().add(user)
+        Session().commit()
 
     def cleanup(self):
         self._cleanup_permissions()

rhodecode/tests/utils.py

@@ -171,6 +171,9 b' class AssertResponse(object):'
         assert len(elements) == 1
         return elements[0]
 
+    def get_elements(self, css_selector):
+        return self._get_elements(css_selector)
+
     def _get_elements(self, css_selector):
         doc = fromstring(self.response.body)
         sel = CSSSelector(css_selector)
@@ -280,3 +283,11 b' def get_session_from_response(response):'
     """
     # TODO: Try to look up the session key also.
     return response.request.environ['beaker.session']
+
+
+def repo_on_filesystem(repo_name):
+    from rhodecode.lib import vcs
+    from rhodecode.tests import TESTS_TMP_PATH
+    repo = vcs.get_vcs_instance(
+        os.path.join(TESTS_TMP_PATH, repo_name), create=False)
+    return repo is not None

rhodecode/tests/vcs/test_hg.py

@@ -711,12 +711,10 b' TODO: To be written...'
         source_ref = Reference('book', bookmark_name, source_commit.raw_id)
         workspace = 'test-merge'
 
-        with mock.patch.object(rhodecode.lib.vcs.conf.settings,
-                               'HG_USE_REBASE_FOR_MERGING', return_value=True):
-            merge_response = target_repo.merge(
-                target_ref, source_repo, source_ref, workspace,
-                'test user', '[e-mail]', 'merge message 1',
-                dry_run=False)
+        merge_response = target_repo.merge(
+            target_ref, source_repo, source_ref, workspace,
+            'test user', '[e-mail]', 'merge message 1',
+            dry_run=False, use_rebase=True)
 
         expected_merge_response = MergeResponse(
             True, True, merge_response.merge_commit_id,

rhodecode/tests/vcs/test_load.py

@@ -38,7 +38,7 b' import os'
 import pytest
 
 from rhodecode.lib.vcs import create_vcsserver_proxy
-from rhodecode.lib.vcs.backends import get_repo, get_backend
+from rhodecode.lib.vcs.backends import get_backend, get_vcs_instance
 from rhodecode.tests import TEST_HG_REPO, TEST_GIT_REPO
 
 
@@ -54,7 +54,7 b' def repo(request, pylonsapp):'
         'hg': TEST_HG_REPO,
         'git': TEST_GIT_REPO,
     }
-    repo = get_repo(repos[request.param])
+    repo = get_vcs_instance(repos[request.param])
     return repo
 
 

rhodecode/tests/vcs/test_vcs.py

@@ -22,14 +22,16 b''
 Tests for main module's methods.
 """
 
+import mock
 import os
 import shutil
+import tempfile
 
 import pytest
 
-from rhodecode.lib.vcs import VCSError, get_repo, get_backend
+from rhodecode.lib.vcs import VCSError, get_backend, get_vcs_instance
 from rhodecode.lib.vcs.backends.hg import MercurialRepository
-from rhodecode.tests import TEST_HG_REPO, TEST_GIT_REPO, TESTS_TMP_PATH
+from rhodecode.tests import TEST_HG_REPO, TEST_GIT_REPO
 
 
 pytestmark = pytest.mark.usefixtures("pylonsapp")
@@ -62,53 +64,81 b' def test_wrong_alias():'
         get_backend(alias)
 
 
-def test_get_repo():
-    alias = 'hg'
-    path = TEST_HG_REPO
-    backend = get_backend(alias)
-    repo = backend(path)
+def test_get_vcs_instance_by_path(vcs_repo):
+    repo = get_vcs_instance(vcs_repo.path)
 
-    assert repo.__class__, get_repo(path == alias).__class__
-    assert repo.path, get_repo(path == alias).path
+    assert repo.__class__ == vcs_repo.__class__
+    assert repo.path == vcs_repo.path
+    assert repo.alias == vcs_repo.alias
+    assert repo.name == vcs_repo.name
 
 
-def test_get_repo_autoalias_hg():
-    alias = 'hg'
-    path = TEST_HG_REPO
-    backend = get_backend(alias)
-    repo = backend(path)
[e-mail]('rhodecode.lib.vcs.backends.get_scm')
[e-mail]('rhodecode.lib.vcs.backends.get_backend')
+def test_get_vcs_instance_by_path_args_passed(
+        get_backend_mock, get_scm_mock):
+    """
+    Test that the arguments passed to ``get_vcs_instance_by_path`` are
+    forewarded to the vcs backend class.
+    """
+    backend = mock.MagicMock()
+    get_backend_mock.return_value = backend
+    args = ['these-are-test-args', 0, True, None]
+    get_vcs_instance(TEST_HG_REPO, *args)
 
-    assert repo.__class__ == get_repo(path).__class__
-    assert repo.path == get_repo(path).path
+    backend.assert_called_with(*args, repo_path=TEST_HG_REPO)
 
 
-def test_get_repo_autoalias_git():
-    alias = 'git'
-    path = TEST_GIT_REPO
-    backend = get_backend(alias)
-    repo = backend(path)
[e-mail]('rhodecode.lib.vcs.backends.get_scm')
[e-mail]('rhodecode.lib.vcs.backends.get_backend')
+def test_get_vcs_instance_by_path_kwargs_passed(
+        get_backend_mock, get_scm_mock):
+    """
+    Test that the keyword arguments passed to ``get_vcs_instance_by_path`` are
+    forewarded to the vcs backend class.
+    """
+    backend = mock.MagicMock()
+    get_backend_mock.return_value = backend
+    kwargs = {
+        'foo': 'these-are-test-args',
+        'bar': 0,
+        'baz': True,
+        'foobar': None
+    }
+    get_vcs_instance(TEST_HG_REPO, **kwargs)
 
-    assert repo.__class__ == get_repo(path).__class__
-    assert repo.path == get_repo(path).path
+    backend.assert_called_with(repo_path=TEST_HG_REPO, **kwargs)
 
 
-def test_get_repo_err():
-    blank_repo_path = os.path.join(TESTS_TMP_PATH, 'blank-error-repo')
-    if os.path.isdir(blank_repo_path):
-        shutil.rmtree(blank_repo_path)
+def test_get_vcs_instance_by_path_err(request):
+    """
+    Test that ``get_vcs_instance_by_path`` returns None if a path is passed
+    to an empty directory.
+    """
+    empty_dir = tempfile.mkdtemp(prefix='pytest-empty-dir-')
 
-    os.mkdir(blank_repo_path)
-    pytest.raises(VCSError, get_repo, blank_repo_path)
-    pytest.raises(VCSError, get_repo, blank_repo_path + 'non_existing')
+    def fin():
+        shutil.rmtree(empty_dir)
+    request.addfinalizer(fin)
+
+    repo = get_vcs_instance(empty_dir)
+
+    assert repo is None
 
 
-def test_get_repo_multialias():
-    multialias_repo_path = os.path.join(TESTS_TMP_PATH, 'hg-git-repo')
-    if os.path.isdir(multialias_repo_path):
-        shutil.rmtree(multialias_repo_path)
+def test_get_vcs_instance_by_path_multiple_repos(request):
+    """
+    Test that ``get_vcs_instance_by_path`` returns None if a path is passed
+    to a directory with multiple repositories.
+    """
+    empty_dir = tempfile.mkdtemp(prefix='pytest-empty-dir-')
+    os.mkdir(os.path.join(empty_dir, '.git'))
+    os.mkdir(os.path.join(empty_dir, '.hg'))
 
-    os.mkdir(multialias_repo_path)
+    def fin():
+        shutil.rmtree(empty_dir)
+    request.addfinalizer(fin)
 
-    os.mkdir(os.path.join(multialias_repo_path, '.git'))
-    os.mkdir(os.path.join(multialias_repo_path, '.hg'))
-    pytest.raises(VCSError, get_repo, multialias_repo_path)
+    repo = get_vcs_instance(empty_dir)
+
+    assert repo is None

rhodecode/translation.py

@@ -20,3 +20,16 b' from pyramid.i18n import TranslationStri'
 
 # Create a translation string factory for the 'rhodecode' domain.
 _ = TranslationStringFactory('rhodecode')
+
+class LazyString(object):
+    def __init__(self, *args, **kw):
+        self.args = args
+        self.kw = kw
+
+    def __str__(self):
+        return _(*self.args, **self.kw)
+
+
+def lazy_ugettext(*args, **kw):
+    """ Lazily evaluated version of _() """
+    return LazyString(*args, **kw)

rhodecode/tweens.py

@@ -67,7 +67,7 b' def pylons_compatibility_tween_factory(h'
             # Setup the pylons context object ('c')
             context = ContextObj()
             context.rhodecode_user = auth_user
-            attach_context_attributes(context)
+            attach_context_attributes(context, request)
             pylons.tmpl_context._push_object(context)
             return handler(request)
         finally:

scripts/notify.py

@@ -24,16 +24,17 b' from rhodecode_api import RhodeCodeAPI'
 
 
 def add_api_pr_args(parser):
+    parser.add_argument("--url", help="Rhodecode host url", required=True)
     parser.add_argument("--token", help="Rhodecode user token", required=True)
-    parser.add_argument("--url", help="Rhodecode host url", required=True)
     parser.add_argument("--repoid", help="Repo id", required=True)
-    parser.add_argument("--prid", help="Pull request id", required=True)
     parser.add_argument("--message", help="Comment to add", required=True)
-
     parser.add_argument("--status", help="Status to set (approved|rejected)")
     parser.add_argument(
+        "--prid",
+        help="(Optional) Pull request id")
+    parser.add_argument(
         "--commit-id",
-        help="Expected commit ID for source repo")
+        help="(Optional) Expected commit ID for source repo")
 
 
 def get_pr_head(args):
@@ -59,18 +60,30 b' if __name__ == "__main__":'
     args = parser.parse_args()
     status = args.status
 
-    if args.commit_id and status:
-        if not pr_has_same_head(args):
-            # PR updated, don't set status
-            status = None
+    rc = RhodeCodeAPI(args.url, args.token)
+
+    if not (args.prid or args.commit_id):
+        raise AttributeError('You must specify --prid or --commit-id')
+
+    if args.prid:
+        if args.commit_id and status:
+            if not pr_has_same_head(args):
+                # PR updated, don't set status
+                status = None
 
-    rc = RhodeCodeAPI(args.url, args.token)
-    resp = rc.comment_pull_request(
-        repoid=args.repoid,
-        pullrequestid=int(args.prid),
-        message=args.message,
-        status=status
-    )
+        resp = rc.comment_pull_request(
+            repoid=args.repoid,
+            pullrequestid=int(args.prid),
+            message=args.message,
+            status=status
+        )
+    elif args.commit_id:
+        resp = rc.comment_commit(
+            repoid=args.repoid,
+            commit_id=args.commit_id,
+            message=args.message,
+            status=status,
+        )
 
     if resp['error']:
         raise Exception(resp['error'])

setup.py

@@ -70,9 +70,12 b' requirements = ['
     'authomatic',
     'backport_ipaddress',
     'celery',
+    'channelstream',
     'colander',
     'decorator',
+    'deform',
     'docutils',
+    'gevent',
     'gunicorn',
     'infrae.cache',
     'ipython',
@@ -81,6 +84,7 b' requirements = ['
     'msgpack-python',
     'packaging',
     'psycopg2',
+    'py-gfm',
     'pycrypto',
     'pycurl',
     'pyparsing',
@@ -99,6 +103,8 b' requirements = ['
     'simplejson',
     'waitress',
     'zope.cachedescriptors',
+    'dogpile.cache',
+    'dogpile.core'
 ]
 
 if is_windows:

shell.nix

@@ -38,12 +38,14 b' in enterprise.override (attrs: {'
   # make development a little bit more convenient.
   src = null;
 
-  buildInputs = attrs.buildInputs ++
-    pkgs.lib.optionals (hasVcsserver) vcsserver.propagatedNativeBuildInputs ++ [
-    pythonPackages.bumpversion
-    pythonPackages.invoke
-    pythonPackages.ipdb
-  ];
+  buildInputs =
+    attrs.buildInputs ++
+    pkgs.lib.optionals (hasVcsserver) vcsserver.propagatedNativeBuildInputs ++
+    (with pythonPackages; [
+      bumpversion
+      invoke
+      ipdb
+    ]);
 
   shellHook = attrs.shellHook +
     pkgs.lib.strings.optionalString (hasVcsserver) ''

test.ini

@@ -1,24 +1,36 b''
-################################################################################
+
+
 ################################################################################
-# RhodeCode Enterprise - configuration file                                    #
-# Built-in functions and variables                                             #
+##                    RHODECODE ENTERPRISE CONFIGURATION                      ##
 # The %(here)s variable will be replaced with the parent directory of this file#
-#                                                                              #
 ################################################################################
 
 [DEFAULT]
 debug = true
-pdebug = false
+
 ################################################################################
+##                            EMAIL CONFIGURATION                             ##
 ## Uncomment and replace with the email address which should receive          ##
 ## any error reports after an application crash                               ##
 ## Additionally these settings will be used by the RhodeCode mailing system   ##
 ################################################################################
-#email_to = admin@localhost
-#error_email_from = paste_error@localhost
+
+## prefix all emails subjects with given prefix, helps filtering out emails
+#email_prefix = [RhodeCode]
+
+## email FROM address all mails will be sent
 #app_email_from = rhodecode-noreply@localhost
+
+## Uncomment and replace with the address which should receive any error report
+## note: using appenlight for error handling doesn't need this to be uncommented
+#email_to = admin@localhost
+
+## in case of Application errors, sent an error email form
+#error_email_from = rhodecode_error@localhost
+
+## additional error message to be send in case of server crash
 #error_message =
-#email_prefix = [RhodeCode]
+
 
 #smtp_server = mail.server.com
 #smtp_username =
@@ -34,9 +46,11 b' pdebug = false'
 host = 0.0.0.0
 port = 5000
 
-##########################
-## WAITRESS WSGI SERVER ##
-##########################
+##################################
+##     WAITRESS WSGI SERVER     ##
+## Recommended for Development  ##
+##################################
+
 use = egg:waitress#main
 ## number of worker threads
 threads = 5
@@ -46,25 +60,18 b' max_request_body_size = 107374182400'
 ## May not work on old windows systems.
 asyncore_use_poll = true
 
-## PASTE HTTP ##
-#use = egg:Paste#http
-## nr of worker threads to spawn
-#threadpool_workers = 5
-## max request before thread respawn
-#threadpool_max_requests = 10
-## option to use threads of process
-#use_threadpool = true
 
 ##########################
 ## GUNICORN WSGI SERVER ##
 ##########################
 ## run with gunicorn --log-config <inifile.ini> --paste <inifile.ini>
+
 #use = egg:gunicorn#main
 ## Sets the number of process workers. You must set `instance_id = *`
 ## when this option is set to more than one worker, recommended
 ## value is (2 * NUMBER_OF_CPUS + 1), eg 2CPU = 5 workers
 ## The `instance_id = *` must be set in the [app:main] section below
-#workers = 1
+#workers = 2
 ## number of threads for each of the worker, must be set to 1 for gevent
 ## generally recommened to be at 1
 #threads = 1
@@ -73,11 +80,13 b' asyncore_use_poll = true'
 ## type of worker class, one of sync, gevent
 ## recommended for bigger setup is using of of other than sync one
 #worker_class = sync
+## The maximum number of simultaneous clients. Valid only for Gevent
+#worker_connections = 10
 ## max number of requests that worker will handle before being gracefully
 ## restarted, could prevent memory leaks
 #max_requests = 1000
 #max_requests_jitter = 30
-## ammount of time a worker can spend with handling a request before it
+## amount of time a worker can spend with handling a request before it
 ## gets killed and restarted. Set to 6hrs
 #timeout = 21600
 
@@ -142,28 +151,45 b' asyncore_use_poll = true'
 #cheaper-step = 1
 
 ## prefix middleware for RhodeCode, disables force_https flag.
+## recommended when using proxy setup.
 ## allows to set RhodeCode under a prefix in server.
 ## eg https://server.com/<prefix>. Enable `filter-with =` option below as well.
-#[filter:proxy-prefix]
-#use = egg:PasteDeploy#prefix
-#prefix = /<your-prefix>
+## optionally set prefix like: `prefix = /<your-prefix>`
+[filter:proxy-prefix]
+use = egg:PasteDeploy#prefix
+prefix = /
 
 [app:main]
 is_test = True
 use = egg:rhodecode-enterprise-ce
-## enable proxy prefix middleware, defined below
+
+## enable proxy prefix middleware, defined above
 #filter-with = proxy-prefix
 
+
+## RHODECODE PLUGINS ##
 rhodecode.includes = rhodecode.api
 
 # api prefix url
 rhodecode.api.url = /_admin/api
 
 
-full_stack = true
+## END RHODECODE PLUGINS ##
+
+## encryption key used to encrypt social plugin tokens,
+## remote_urls with credentials etc, if not set it defaults to
+## `beaker.session.secret`
+#rhodecode.encrypted_values.secret =
 
-## Serve static files via RhodeCode, disable to serve them via HTTP server
-static_files = true
+## decryption strict mode (enabled by default). It controls if decryption raises
+## `SignatureVerificationError` in case of wrong key, or damaged encryption data.
+#rhodecode.encrypted_values.strict = false
+
+## return gzipped responses from Rhodecode (static files/application)
+gzip_responses = false
+
+## autogenerate javascript routes file on startup
+generate_js_files = false
 
 ## Optional Languages
 ## en(default), be, de, es, fr, it, ja, pl, pt, ru, zh
@@ -245,6 +271,21 b' default_encoding = UTF-8'
 ## all running rhodecode instances. Leave empty if you don't use it
 instance_id =
 
+## Fallback authentication plugin. Set this to a plugin ID to force the usage
+## of an authentication plugin also if it is disabled by it's settings.
+## This could be useful if you are unable to log in to the system due to broken
+## authentication settings. Then you can enable e.g. the internal rhodecode auth
+## module to log in again and fix the settings.
+##
+## Available builtin plugin IDs (hash is part of the ID):
+## egg:rhodecode-enterprise-ce#rhodecode
+## egg:rhodecode-enterprise-ce#pam
+## egg:rhodecode-enterprise-ce#ldap
+## egg:rhodecode-enterprise-ce#jasig_cas
+## egg:rhodecode-enterprise-ce#headers
+## egg:rhodecode-enterprise-ce#crowd
+#rhodecode.auth_plugin_fallback = egg:rhodecode-enterprise-ce#rhodecode
+
 ## alternative return HTTP header for failed authentication. Default HTTP
 ## response is 401 HTTPUnauthorized. Currently HG clients have troubles with
 ## handling that causing a series of failed authentication calls.
@@ -336,8 +377,8 b' beaker.cache.sql_cache_short.type = memo'
 beaker.cache.sql_cache_short.expire = 1
 beaker.cache.sql_cache_short.key_length = 256
 
-# default is memory cache, configure only if required
-# using multi-node or multi-worker setup
+## default is memory cache, configure only if required
+## using multi-node or multi-worker setup
 #beaker.cache.auth_plugins.type = ext:database
 #beaker.cache.auth_plugins.lock_dir = %(here)s/data/cache/auth_plugin_lock
 #beaker.cache.auth_plugins.url = postgresql://postgres:secret@localhost/rhodecode
@@ -350,8 +391,8 b' beaker.cache.repo_cache_long.type = memo'
 beaker.cache.repo_cache_long.max_items = 4096
 beaker.cache.repo_cache_long.expire = 2592000
 
-# default is memorylru_base cache, configure only if required
-# using multi-node or multi-worker setup
+## default is memorylru_base cache, configure only if required
+## using multi-node or multi-worker setup
 #beaker.cache.repo_cache_long.type = ext:memcached
 #beaker.cache.repo_cache_long.url = localhost:11211
 #beaker.cache.repo_cache_long.expire = 1209600
@@ -362,12 +403,12 b' beaker.cache.repo_cache_long.expire = 25'
 ####################################
 
 ## .session.type is type of storage options for the session, current allowed
-## types are file(default), ext:memcached, ext:database, and memory.
-#beaker.session.type = file
+## types are file, ext:memcached, ext:database, and memory (default).
+beaker.session.type = file
+beaker.session.data_dir = %(here)s/rc/data/sessions/data
 
-## db based session, fast, and allows easy management over logged in users ##
+## db based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
-#beaker.session.lock_dir = %(here)s/data/cache/session_db_lock
 #beaker.session.table_name = db_session
 #beaker.session.sa.url = postgresql://postgres:secret@localhost/rhodecode
 #beaker.session.sa.url = mysql://root:secret@127.0.0.1/rhodecode
@@ -376,6 +417,7 b' beaker.cache.repo_cache_long.expire = 25'
 
 beaker.session.key = rhodecode
 beaker.session.secret = test-rc-uytcxaz
+beaker.session.lock_dir = %(here)s/rc/data/sessions/lock
 
 ## Secure encrypted cookie. Requires AES and AES python libraries
 ## you must disable beaker.session.secret to use this
@@ -386,6 +428,7 b' beaker.session.secret = test-rc-uytcxaz'
 ## accessed for given amount of time in seconds
 beaker.session.timeout = 2592000
 beaker.session.httponly = true
+## Path to use for the cookie.
 #beaker.session.cookie_path = /<your-prefix>
 
 ## uncomment for https secure cookie
@@ -401,12 +444,33 b' beaker.session.auto = false'
 ###################################
 ## SEARCH INDEXING CONFIGURATION ##
 ###################################
+## Full text search indexer is available in rhodecode-tools under
+## `rhodecode-tools index` command
 
+# WHOOSH Backend, doesn't require additional services to run
+# it works good with few dozen repos
 search.module = rhodecode.lib.index.whoosh
 search.location = %(here)s/data/index
 
+########################################
+###    CHANNELSTREAM CONFIG         ####
+########################################
+## channelstream enables persistent connections and live notification
+## in the system. It's also used by the chat system
+
+channelstream.enabled = false
+# location of channelstream server on the backend
+channelstream.server = 127.0.0.1:9800
+## location of the channelstream server from outside world
+## most likely this would be an http server special backend URL, that handles
+## websocket connections see nginx example for config
+channelstream.ws_url = ws://rhodecode.yourserver.com/_channelstream
+channelstream.secret = secret
+channelstream.history.location = %(here)s/channelstream_history
+
+
 ###################################
-## ERROR AND LOG HANDLING SYSTEM ##
+##       APPENLIGHT CONFIG       ##
 ###################################
 
 ## Appenlight is tailored to work with RhodeCode, see
@@ -417,7 +481,7 b' appenlight = false'
 
 appenlight.server_url = https://api.appenlight.com
 appenlight.api_key = YOUR_API_KEY
-;appenlight.transport_config = https://api.appenlight.com?threaded=1&timeout=5
+#appenlight.transport_config = https://api.appenlight.com?threaded=1&timeout=5
 
 # used for JS client
 appenlight.api_public_key = YOUR_API_PUBLIC_KEY
@@ -480,9 +544,10 b' debug_style = false'
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
-sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode_test.db
+#sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode_test.db
 #sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode_test
 #sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode_test
+sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode_test.db
 
 # see sqlalchemy docs for other advanced settings
 
@@ -507,12 +572,57 b' sqlalchemy.db1.convert_unicode = true'
 ##################
 vcs.server.enable = true
 vcs.server = localhost:9901
-# Available protocols: pyro4, http
+
+## Web server connectivity protocol, responsible for web based VCS operatations
+## Available protocols are:
+## `pyro4` - using pyro4 server
+## `http` - using http-rpc backend
 vcs.server.protocol = pyro4
-vcs.server.log_level = info
-vcs.start_server = false
+
+## Push/Pull operations protocol, available options are:
+## `pyro4` - using pyro4 server
+## `rhodecode.lib.middleware.utils.scm_app_http` - Http based, recommended
+## `vcsserver.scm_app` - internal app (EE only)
+vcs.scm_app_implementation = pyro4
+
+## Push/Pull operations hooks protocol, available options are:
+## `pyro4` - using pyro4 server
+## `http` - using http-rpc backend
+vcs.hooks.protocol = pyro4
+
+vcs.server.log_level = debug
+## Start VCSServer with this instance as a subprocess, usefull for development
+vcs.start_server = true
+
+## List of enabled VCS backends, available options are:
+## `hg`  - mercurial
+## `git` - git
+## `svn` - subversion
 vcs.backends = hg, git, svn
+
 vcs.connection_timeout = 3600
+## Compatibility version when creating SVN repositories. Defaults to newest version when commented out.
+## Available options are: pre-1.4-compatible, pre-1.5-compatible, pre-1.6-compatible, pre-1.8-compatible
+#vcs.svn.compatible_version = pre-1.8-compatible
+
+
+############################################################
+### Subversion proxy support (mod_dav_svn)               ###
+### Maps RhodeCode repo groups into SVN paths for Apache ###
+############################################################
+## Enable or disable the config file generation.
+svn.proxy.generate_config = false
+## Generate config file with `SVNListParentPath` set to `On`.
+svn.proxy.list_parent_path = true
+## Set location and file name of generated config file.
+svn.proxy.config_file_path = %(here)s/mod_dav_svn.conf
+## File system path to the directory containing the repositories served by
+## RhodeCode.
+svn.proxy.parent_path_root = /path/to/repo_store
+## Used as a prefix to the <Location> block in the generated config file. In
+## most cases it should be set to `/`.
+svn.proxy.location_root = /
+
 
 ################################
 ### LOGGING CONFIGURATION   ####
@@ -530,7 +640,7 b' keys = generic, color_formatter, color_f'
 ## LOGGERS ##
 #############
 [logger_root]
-level = DEBUG
+level = NOTSET
 handlers = console
 
 [logger_routes]
@@ -577,7 +687,7 b' propagate = 0'
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
-level = INFO
+level = DEBUG
 formatter = generic
 
 [handler_console_sql]

acceptance_tests/README.rst

@@ -1,47 +0,0 b''
-README - Quickstart
-===================
-
-This folder contains the functional tests and automation of specification
-examples. Details about testing can be found in
-`/docs-internal/testing/index.rst`.
-
-
-Setting up your Rhodecode Enterprise instance
----------------------------------------------
-
-The tests will create users and repositories as needed, so you can start with a
-new and empty instance.
-
-Use the following example call for the database setup of Enterprise::
-
-   paster setup-rhodecode \
-     --user=admin \
-     --email=[e-mail] \
-     --password=secret \
-     --api-key=9999999999999999999999999999999999999999 \
-     your-enterprise-config.ini
-
-This way the username, password, and auth token of the admin user will match the
-defaults from the test run.
-
-
-Usage
------
-
-1. Make sure your Rhodecode Enterprise instance is running at
-   http://localhost:5000.
-
-2. Enter `nix-shell` from the acceptance_tests folder::
-
-     cd acceptance_tests
-     nix-shell
-
-   Make sure that `rcpkgs` and `rcnixpkgs` are available on the nix path.
-
-3. Run the tests::
-
-     py.test -c example.ini -vs
-
-   The parameter ``-vs`` allows you to see debugging output during the test
-   run. Check ``py.test --help`` and the documentation at http://pytest.org to
-   learn all details about the test runner.

rhodecode/model/validation_schema.py

@@ -1,66 +0,0 b''
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2016-2016  RhodeCode GmbH
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License, version 3
-# (only), as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This program is dual-licensed. If you wish to learn more about the
-# RhodeCode Enterprise Edition, including its added features, Support services,
-# and proprietary license terms, please see https://rhodecode.com/licenses/
-
-import colander
-from colander import Invalid  # noqa
-
-
-class GroupNameType(colander.String):
-    SEPARATOR = '/'
-
-    def deserialize(self, node, cstruct):
-        result = super(GroupNameType, self).deserialize(node, cstruct)
-        return self._replace_extra_slashes(result)
-
-    def _replace_extra_slashes(self, path):
-        path = path.split(self.SEPARATOR)
-        path = [item for item in path if item]
-        return self.SEPARATOR.join(path)
-
-
-class RepoGroupSchema(colander.Schema):
-    group_name = colander.SchemaNode(GroupNameType())
-
-
-class RepoSchema(colander.Schema):
-    repo_name = colander.SchemaNode(GroupNameType())
-
-
-class SearchParamsSchema(colander.MappingSchema):
-    search_query = colander.SchemaNode(
-        colander.String(),
-        missing='')
-    search_type = colander.SchemaNode(
-        colander.String(),
-        missing='content',
-        validator=colander.OneOf(['content', 'path', 'commit', 'repository']))
-    search_sort = colander.SchemaNode(
-        colander.String(),
-        missing='newfirst',
-        validator=colander.OneOf(
-            ['oldfirst', 'newfirst']))
-    page_limit = colander.SchemaNode(
-        colander.Integer(),
-        missing=10,
-        validator=colander.Range(1, 500))
-    requested_page = colander.SchemaNode(
-        colander.Integer(),
-        missing=1)
-

rhodecode/public/js/mode/css/gss_test.js

@@ -1,17 +0,0 b''
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  "use strict";
-
-  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-gss");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "gss"); }
-
-  MT("atComponent",
-     "[def @component] {",
-     "[tag foo] {",
-     "  [property color]: [keyword black];",
-     "}",
-     "}");
-
-})();

rhodecode/public/js/mode/css/less_test.js

@@ -1,54 +0,0 b''
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  "use strict";
-
-  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-less");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "less"); }
-
-  MT("variable",
-     "[variable-2 @base]: [atom #f04615];",
-     "[qualifier .class] {",
-     "  [property width]: [variable percentage]([number 0.5]); [comment // returns `50%`]",
-     "  [property color]: [variable saturate]([variable-2 @base], [number 5%]);",
-     "}");
-
-  MT("amp",
-     "[qualifier .child], [qualifier .sibling] {",
-     "  [qualifier .parent] [atom &] {",
-     "    [property color]: [keyword black];",
-     "  }",
-     "  [atom &] + [atom &] {",
-     "    [property color]: [keyword red];",
-     "  }",
-     "}");
-
-  MT("mixin",
-     "[qualifier .mixin] ([variable dark]; [variable-2 @color]) {",
-     "  [property color]: [variable darken]([variable-2 @color], [number 10%]);",
-     "}",
-     "[qualifier .mixin] ([variable light]; [variable-2 @color]) {",
-     "  [property color]: [variable lighten]([variable-2 @color], [number 10%]);",
-     "}",
-     "[qualifier .mixin] ([variable-2 @_]; [variable-2 @color]) {",
-     "  [property display]: [atom block];",
-     "}",
-     "[variable-2 @switch]: [variable light];",
-     "[qualifier .class] {",
-     "  [qualifier .mixin]([variable-2 @switch]; [atom #888]);",
-     "}");
-
-  MT("nest",
-     "[qualifier .one] {",
-     "  [def @media] ([property width]: [number 400px]) {",
-     "    [property font-size]: [number 1.2em];",
-     "    [def @media] [attribute print] [keyword and] [property color] {",
-     "      [property color]: [keyword blue];",
-     "    }",
-     "  }",
-     "}");
-
-
-  MT("interpolation", ".@{[variable foo]} { [property font-weight]: [atom bold]; }");
-})();

rhodecode/public/js/mode/css/scss_test.js

@@ -1,110 +0,0 b''
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-scss");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
-
-  MT('url_with_quotation',
-    "[tag foo] { [property background]:[atom url]([string test.jpg]) }");
-
-  MT('url_with_double_quotes',
-    "[tag foo] { [property background]:[atom url]([string \"test.jpg\"]) }");
-
-  MT('url_with_single_quotes',
-    "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) }");
-
-  MT('string',
-    "[def @import] [string \"compass/css3\"]");
-
-  MT('important_keyword',
-    "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) [keyword !important] }");
-
-  MT('variable',
-    "[variable-2 $blue]:[atom #333]");
-
-  MT('variable_as_attribute',
-    "[tag foo] { [property color]:[variable-2 $blue] }");
-
-  MT('numbers',
-    "[tag foo] { [property padding]:[number 10px] [number 10] [number 10em] [number 8in] }");
-
-  MT('number_percentage',
-    "[tag foo] { [property width]:[number 80%] }");
-
-  MT('selector',
-    "[builtin #hello][qualifier .world]{}");
-
-  MT('singleline_comment',
-    "[comment // this is a comment]");
-
-  MT('multiline_comment',
-    "[comment /*foobar*/]");
-
-  MT('attribute_with_hyphen',
-    "[tag foo] { [property font-size]:[number 10px] }");
-
-  MT('string_after_attribute',
-    "[tag foo] { [property content]:[string \"::\"] }");
-
-  MT('directives',
-    "[def @include] [qualifier .mixin]");
-
-  MT('basic_structure',
-    "[tag p] { [property background]:[keyword red]; }");
-
-  MT('nested_structure',
-    "[tag p] { [tag a] { [property color]:[keyword red]; } }");
-
-  MT('mixin',
-    "[def @mixin] [tag table-base] {}");
-
-  MT('number_without_semicolon',
-    "[tag p] {[property width]:[number 12]}",
-    "[tag a] {[property color]:[keyword red];}");
-
-  MT('atom_in_nested_block',
-    "[tag p] { [tag a] { [property color]:[atom #000]; } }");
-
-  MT('interpolation_in_property',
-    "[tag foo] { #{[variable-2 $hello]}:[number 2]; }");
-
-  MT('interpolation_in_selector',
-    "[tag foo]#{[variable-2 $hello]} { [property color]:[atom #000]; }");
-
-  MT('interpolation_error',
-    "[tag foo]#{[variable foo]} { [property color]:[atom #000]; }");
-
-  MT("divide_operator",
-    "[tag foo] { [property width]:[number 4] [operator /] [number 2] }");
-
-  MT('nested_structure_with_id_selector',
-    "[tag p] { [builtin #hello] { [property color]:[keyword red]; } }");
-
-  MT('indent_mixin',
-     "[def @mixin] [tag container] (",
-     "  [variable-2 $a]: [number 10],",
-     "  [variable-2 $b]: [number 10])",
-     "{}");
-
-  MT('indent_nested',
-     "[tag foo] {",
-     "  [tag bar] {",
-     "  }",
-     "}");
-
-  MT('indent_parentheses',
-     "[tag foo] {",
-     "  [property color]: [variable darken]([variable-2 $blue],",
-     "    [number 9%]);",
-     "}");
-
-  MT('indent_vardef',
-     "[variable-2 $name]:",
-     "  [string 'val'];",
-     "[tag tag] {",
-     "  [tag inner] {",
-     "    [property margin]: [number 3px];",
-     "  }",
-     "}");
-})();

rhodecode/tests/load/performance.py

@@ -1,389 +0,0 b''
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2010-2016  RhodeCode GmbH
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License, version 3
-# (only), as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This program is dual-licensed. If you wish to learn more about the
-# RhodeCode Enterprise Edition, including its added features, Support services,
-# and proprietary license terms, please see https://rhodecode.com/licenses/
-
-"""
-This is a locustio based test scenario simulating users on the web interface.
-
-To run it::
-
-   locust -f rhodecode/tests/load/performance.py --no-web -c 5 -r 5
-
-Discover details regarding the command with the ``--help`` parameter and the
-documentation at http://docs.locust.io/en/latest/ .
-
-With the environment variable `SEED` it is possible to create more or less
-repeatable runs. They are not fully repeatable, since the response times from
-the server vary and so two test runs with the same seed value will sooner or
-later run out of sync.
-"""
-
-import logging
-import os
-import random
-import re
-
-from locust import HttpLocust, TaskSet, task
-
-
-log = logging.getLogger('performance')
-
-# List of repositories which shall be used during the test run
-REPOSITORIES = [
-    'vcs_test_git',
-    'vcs_test_hg',
-    'vcs_test_svn',
-#    'linux',
-#    'cpython',
-#    'git',
-]
-
-HOST = 'http://localhost:5000'
-
-
-# List of user accounts to login to the test system.
-# Format: tuple(username, password)
-USER_ACCOUNTS = [
-    ('test_admin', 'test12'),
-]
-
-# Toggle this to show and aggregate results on individual URLs
-SHOW_DETAILS = False
-
-# Used to initialize pseudo random generators which are used to select
-# the next task, to take a decision etc.
-_seed = os.environ.get('SEED', None)
-
-try:
-    _seed = int(_seed)
-except ValueError:
-    pass
-
-if (isinstance(_seed, basestring) and
-        os.environ.get('PYTHONHASHSEED', None) == 'random'):
-    print("Setting a SEED does not work if PYTHONHASHSEED is set to random.")
-    print("Use a numeric value for SEED or unset PYTHONHASHSEED.")
-    exit(1)
-
-log.info("Using SEED %s", _seed)
-
-_seeder = random.Random(_seed)
-
-
-class BaseTaskSet(TaskSet):
-
-    _decision = None
-    _random = None
-
-    def __init__(self, parent):
-        super(BaseTaskSet, self).__init__(parent)
-        log_name = "user.%s" % (id(self.locust), )
-        self.log = log.getChild(log_name)
-
-    @property
-    def decision(self):
-        if self._decision:
-            return self._decision
-        return self.parent.decision
-
-    @property
-    def random(self):
-        if self._random:
-            return self._random
-        return self.parent.random
-
-    def get_next_task(self):
-        task = self.random.choice(self.tasks)
-        self.log.debug("next task %s", task.__name__)
-        return task
-
-    def wait(self):
-        millis = self.random.randint(self.min_wait, self.max_wait)
-        seconds = millis / 1000.0
-        self.log.debug("sleeping %s", seconds)
-        self._sleep(seconds)
-
-
-class BrowseLatestChanges(BaseTaskSet):
-    """
-    User browsing through the latest changes form the summary page
-    """
-    page_size = 10
-
-    def on_start(self):
-        self.repo = self.decision.choose_repository()
-        self.page = 1
-        self.response = self.client.get('/%s' % (self.repo, ))
-
-    @task(20)
-    def goto_next_page(self):
-        self.page += 1
-        self.get_changelog_summary()
-
-    @task(5)
-    def goto_prev_page(self):
-        self.page -= 1
-        if self.page < 0:
-            self.interrupt()
-        self.get_changelog_summary()
-
-    @task(20)
-    def open_commit(self):
-        commits = get_commit_links(self.response.content)
-        commit = self.decision.choose(commits, "commit")
-        if not commit:
-            return
-        self.client.get(
-            commit,
-            name=self._commit_name(commit))
-
-    def get_changelog_summary(self):
-        summary = '/%s?size=%s&page=%s' % (
-            self.repo, self.page_size, self.page)
-        self.response = self.client.get(
-            summary,
-            headers={'X-PARTIAL-XHR': 'true'},
-            name=self._changelog_summary_name(summary))
-
-    @task(1)
-    def stop(self):
-        self.interrupt()
-
-    def _commit_name(self, url):
-        if SHOW_DETAILS:
-            return url
-        return '/%s/changeset/{{commit_id}}' % (self.repo, )
-
-    def _changelog_summary_name(self, url):
-        if SHOW_DETAILS:
-            return url
-        return '/%s?size={{size}}&page={{page}}' % (self.repo, )
-
-
-class BrowseChangelog(BaseTaskSet):
-
-    def on_start(self):
-        self.repo = self.decision.choose_repository()
-        self.page = 1
-        self.open_changelog_page()
-
-    @task(20)
-    def goto_next_page(self):
-        self.page += 1
-        self.open_changelog_page()
-
-    @task(5)
-    def goto_prev_page(self):
-        self.page -= 1
-        self.open_changelog_page()
-
-    @task(20)
-    def open_commit(self):
-        commits = get_commit_links(self.response.content)
-        commit = self.decision.choose(commits, "commit")
-        if not commit:
-            return
-        self.client.get(
-            commit,
-            name=self._commit_name(commit))
-
-    def open_changelog_page(self):
-        if self.page <= 0:
-            self.interrupt()
-        changelog = '/%s/changelog?page=%s' % (self.repo, self.page)
-        self.response = self.client.get(
-            changelog,
-            name=self._changelog_page_name(changelog))
-
-    @task(1)
-    def stop(self):
-        self.interrupt()
-
-    def _commit_name(self, url):
-        if SHOW_DETAILS:
-            return url
-        return '/%s/changeset/{{commit_id}}' % (self.repo, )
-
-    def _changelog_page_name(self, url):
-        if SHOW_DETAILS:
-            return url
-        return '/%s/changelog/?page={{page}}' % (self.repo, )
-
-
-class BrowseFiles(BaseTaskSet):
-
-    def on_start(self):
-        self.stack = []
-        self.repo = self.decision.choose_repository()
-        self.fetch_directory()
-
-    def fetch_directory(self, url=None):
-        if not url:
-            url = '/%s/files/tip/' % (self.repo, )
-        response = self.client.get(url, name=self._url_name('dir', url=url))
-        self.stack.append({
-            'directories': get_directory_links(response.content, self.repo),
-            'files': get_file_links(response.content, self.repo, 'files'),
-            'files_raw': get_file_links(response.content, self.repo, 'raw'),
-            'files_annotate': get_file_links(response.content, self.repo, 'annotate'),
-        })
-
-    @task(10)
-    def browse_directory(self):
-        dirs = self.stack[-1]['directories']
-        if not dirs:
-            return
-        url = self.decision.choose(dirs, "directory")
-        self.fetch_directory(url=url)
-
-    @task(10)
-    def browse_file(self):
-        files = self.stack[-1]['files']
-        if not files:
-            return
-        file_url = self.decision.choose(files, "file")
-        self.client.get(file_url, name=self._url_name('file', file_url))
-
-    @task(10)
-    def browse_raw_file(self):
-        files = self.stack[-1]['files_raw']
-        if not files:
-            return
-        file_url = self.decision.choose(files, "file")
-        self.client.get(file_url, name=self._url_name('file_raw', file_url))
-
-    @task(10)
-    def browse_annotate_file(self):
-        files = self.stack[-1]['files_annotate']
-        if not files:
-            return
-        file_url = self.decision.choose(files, "file")
-        self.client.get(
-            file_url, name=self._url_name('file_annotate', file_url))
-
-    @task(5)
-    def back_to_parent_directory(self):
-        if not len(self.stack) > 1:
-            return
-        self.stack.pop()
-
-    @task(1)
-    def stop(self):
-        self.interrupt()
-
-    def _url_name(self, kind, url):
-        if SHOW_DETAILS:
-            return url
-        return '/%s/%s/{{commit_id}}/{{path}}' % (self.repo, kind)
-
-
-class UserBehavior(BaseTaskSet):
-
-    tasks = [
-        (BrowseLatestChanges, 1),
-        (BrowseChangelog, 1),
-        (BrowseFiles, 2),
-    ]
-
-    def on_start(self):
-        seed = getattr(self.locust, "seed", None)
-        self._decision = ChoiceMaker(random.Random(seed), log=self.log)
-        self._random = random.Random(seed)
-        user_account = self.decision.choose_user()
-        data = {
-            'username': user_account[0],
-            'password': user_account[1],
-        }
-        response = self.client.post(
-            '/_admin/login?came_from=/', data=data, allow_redirects=False)
-
-        # Sanity check that the login worked out.
-        # Successful login means we are redirected to "came_from".
-        assert response.status_code == 302
-        assert response.headers['location'] == self.locust.host + '/'
-
-    @task(2)
-    def browse_index_page(self):
-        self.client.get('/')
-
-
-class WebsiteUser(HttpLocust):
-    host = HOST
-    task_set = UserBehavior
-    min_wait = 1000
-    max_wait = 1000
-
-    def __init__(self):
-        super(WebsiteUser, self).__init__()
-        self.seed = _seeder.random()
-        log.info("WebsiteUser with seed %s", self.seed)
-
-
-class ChoiceMaker(object):
-
-    def __init__(self, random, log=None):
-        self._random = random
-        self.log = log
-
-    def choose(self, choices, kind=None):
-        if len(choices) == 0:
-            self.log.debug("nothing to choose from")
-            return None
-
-        item = self._random.choice(choices)
-        self.log.debug("choosing %s %s", kind or "item", item)
-        return item
-
-    def choose_user(self):
-        return self.choose(USER_ACCOUNTS, "user")
-
-    def choose_repository(self):
-        return self.choose(REPOSITORIES, "repository")
-
-
-def get_commit_links(content):
-    # TODO: find out a way to read the HTML and grab elements by selector
-    links = re.findall(
-        r'<a.*?class="message-link".*?href="(.*?)".*?/a>', content)
-    return links
-
-
-def get_directory_links(content, repo_name):
-    return _get_links(content, 'browser-dir')
-
-
-def get_file_links(content, repo_name, link_type):
-
-    def _process(lnk, repo_name, link_type):
-        if link_type == 'files':
-            return lnk
-        elif link_type == 'raw':
-            return re.sub(r'%s/files/' % repo_name, r'%s/raw/' % repo_name, lnk)
-        elif link_type == 'annotate':
-            return re.sub(r'%s/files/' % repo_name, r'%s/annotate/' % repo_name, lnk)
-    links = []
-    for lnk in _get_links(content, 'browser-file'):
-        links.append(_process(lnk, repo_name, link_type))
-    return links
-
-
-def _get_links(content, class_name):
-    return re.findall(
-        r'<a.*?class="' + class_name + r'.*?href="(.*?)".*?/a>',
-        content)

rhodecode/tests/load/performance.rst

@@ -1,1011 +0,0 b''
-===========
-Performance
-===========
-
-This is a record of the comparison of the RC codebase before and after VCS2 changes.
-
-
-Performance Comparison
-----------------------
-
-Based on RC from:
-    https://code.rhodecode.com/johbo/rhodecode-fork
-
-Database was SQLite loaded with large repositories:
-    Git @6c4ab27f2378ce67940b4496365043119d7ffff2 (https://github.com/git/git.git)
-    CPython @92241 (http://hg.python.org/cpython)
-
-Command to execute the performance comparison (toggle SHOW_DETAILS in script):
-    SEED=performance locust -f rhodecode/tests/load/performance.py --no-web -c 4 -r 4 -n 500
-
-
-RC Branch@v.2.2.5
-+++++++++++++++++
-
- Name                                                          # reqs      # fails     Avg     Min     Max  |  Median   req/s
---------------------------------------------------------------------------------------------------------------------------------------------
- GET /                                                              9     0(0.00%)     585     233    1009  |     560    0.00
- POST /_admin/login?came_from=/                                     2     0(0.00%)     652     619     685  |     620    0.00
- GET /cpython                                                       2     0(0.00%)     633     362     904  |     360    0.00
- GET /cpython/annotate/{revision}/{path} [file_annotate]           12     0(0.00%)    1159     335    4160  |     870    0.00
- GET /cpython/changelog/?page={page}                              169     0(0.00%)     769     208    1678  |     730    0.20
- GET /cpython/changelog_summary?page={page}                        25     0(0.00%)     455     179     946  |     360    0.00
- GET /cpython/changeset/{changeset}                               166     0(0.00%)     755     221    2762  |     700    0.20
- GET /cpython/file/{revision}/{path} [dir]                         12     0(0.00%)    1749     245    2870  |    1400    0.00
- GET /cpython/file/{revision}/{path} [file]                        14     0(0.00%)     877     233    1541  |     880    0.00
- GET /cpython/raw/{revision}/{path} [file_raw]                     18     0(0.00%)     652     211    1315  |     650    0.00
- GET /git                                                           1     0(0.00%)    4833    4833    4833  |    4800    0.00
- GET /git/annotate/{revision}/{path} [file_annotate]                8     0(0.00%)    2923    1026    9228  |    1700    0.00
- GET /git/changelog/?page={page}                                   24     0(0.00%)    2894    1782    5362  |    2700    0.00
- GET /git/changelog_summary?page={page}                             4     0(0.00%)    1155     508    1737  |     770    0.00
- GET /git/changeset/{changeset}                                     3     0(0.00%)     551     443     742  |     470    0.00
- GET /git/file/{revision}/{path} [dir]                             11     0(0.00%)   16383    1158   53965  |    4900    0.40
- GET /git/file/{revision}/{path} [file]                            11     0(0.00%)    1088     391    1836  |    1100    0.00
- GET /git/raw/{revision}/{path} [file_raw]                          9     0(0.00%)     729     244    1363  |     720    0.10
---------------------------------------------------------------------------------------------------------------------------------------------
- Total                                                            500     0(0.00%)                                       0.90
-
-
- Name                                                          # reqs      # fails     Avg     Min     Max  |  Median   req/s
---------------------------------------------------------------------------------------------------------------------------------------------
- GET /                                                             10     0(0.00%)     601     299    1015  |     560    0.20
- POST /_admin/login?came_from=/                                     2     0(0.00%)     644     575     713  |     580    0.00
- GET /cpython                                                       2     0(0.00%)     782     439    1126  |     440    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/.hgtags       2     0(0.00%)    1470     988    1953  |     990    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Grammar/Grammar       2     0(0.00%)     603     451     756  |     450    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Makefile.pre.in       1     0(0.00%)    4010    4010    4010  |    4000    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Misc/RPM/README       1     0(0.00%)    1373    1373    1373  |    1400    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Misc/valgrind-python.supp       1     0(0.00%)     985     985     985  |     990    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Programs/README       1     0(0.00%)     506     506     506  |     510    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Programs/_freeze_importlib.c       1     0(0.00%)     882     882     882  |     880    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Programs/_testembed.c       2     0(0.00%)     579     318     840  |     320    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Programs/python.c       1     0(0.00%)    1002    1002    1002  |    1000    0.00
- GET /cpython/changelog?page=1                                      6     0(0.00%)     643     296    1471  |     440    0.00
- GET /cpython/changelog?page=10                                     3     0(0.00%)    1046     987    1088  |    1100    0.00
- GET /cpython/changelog?page=11                                     5     0(0.00%)     579     340     932  |     570    0.00
- GET /cpython/changelog?page=12                                     7     0(0.00%)     677     296    1404  |     530    0.00
- GET /cpython/changelog?page=13                                     6     0(0.00%)     555     350     940  |     430    0.00
- GET /cpython/changelog?page=14                                     4     0(0.00%)     323     254     371  |     330    0.00
- GET /cpython/changelog?page=15                                     3     0(0.00%)     571     250    1020  |     440    0.00
- GET /cpython/changelog?page=16                                     2     0(0.00%)     611     568     655  |     570    0.00
- GET /cpython/changelog?page=17                                     2     0(0.00%)     848     843     854  |     840    0.00
- GET /cpython/changelog?page=18                                     2     0(0.00%)    1020     804    1236  |     800    0.00
- GET /cpython/changelog?page=19                                     4     0(0.00%)     729     340    1104  |     690    0.00
- GET /cpython/changelog?page=2                                      4     0(0.00%)     491     258     984  |     360    0.00
- GET /cpython/changelog?page=20                                     5     0(0.00%)     847     469    1093  |     860    0.00
- GET /cpython/changelog?page=21                                     3     0(0.00%)    1341    1127    1503  |    1400    0.00
- GET /cpython/changelog?page=22                                     3     0(0.00%)     642     528     838  |     560    0.00
- GET /cpython/changelog?page=23                                     3     0(0.00%)     489     361     684  |     420    0.00
- GET /cpython/changelog?page=24                                     2     0(0.00%)     588     392     785  |     390    0.00
- GET /cpython/changelog?page=25                                     2     0(0.00%)     872     726    1019  |     730    0.00
- GET /cpython/changelog?page=26                                     9     0(0.00%)     923     414    1648  |     920    0.00
- GET /cpython/changelog?page=27                                    10     0(0.00%)     974     592    1426  |     970    0.00
- GET /cpython/changelog?page=28                                     5     0(0.00%)    1105     558    1389  |    1300    0.00
- GET /cpython/changelog?page=29                                     4     0(0.00%)    1009     860    1135  |     920    0.00
- GET /cpython/changelog?page=3                                      4     0(0.00%)     768     356    1211  |     520    0.00
- GET /cpython/changelog?page=30                                     1     0(0.00%)     398     398     398  |     400    0.00
- GET /cpython/changelog?page=31                                     1     0(0.00%)    1231    1231    1231  |    1200    0.00
- GET /cpython/changelog?page=32                                     1     0(0.00%)    1231    1231    1231  |    1200    0.00
- GET /cpython/changelog?page=33                                     3     0(0.00%)     765     266    1115  |     920    0.00
- GET /cpython/changelog?page=34                                     4     0(0.00%)     756     695     922  |     700    0.00
- GET /cpython/changelog?page=35                                     2     0(0.00%)     583     480     687  |     480    0.00
- GET /cpython/changelog?page=36                                     1     0(0.00%)     511     511     511  |     510    0.00
- GET /cpython/changelog?page=37                                     3     0(0.00%)     926     706    1054  |    1000    0.00
- GET /cpython/changelog?page=38                                     3     0(0.00%)     851     595    1015  |     940    0.00
- GET /cpython/changelog?page=39                                     1     0(0.00%)     689     689     689  |     690    0.00
- GET /cpython/changelog?page=4                                      5     0(0.00%)     729     443    1459  |     450    0.00
- GET /cpython/changelog?page=40                                     1     0(0.00%)    1115    1115    1115  |    1100    0.00
- GET /cpython/changelog?page=41                                     1     0(0.00%)     943     943     943  |     940    0.00
- GET /cpython/changelog?page=42                                     1     0(0.00%)     487     487     487  |     490    0.00
- GET /cpython/changelog?page=43                                     2     0(0.00%)     714     439     990  |     440    0.00
- GET /cpython/changelog?page=44                                     2     0(0.00%)     741     444    1038  |     440    0.00
- GET /cpython/changelog?page=45                                     1     0(0.00%)     923     923     923  |     920    0.00
- GET /cpython/changelog?page=46                                     1     0(0.00%)    1245    1245    1245  |    1200    0.00
- GET /cpython/changelog?page=47                                     1     0(0.00%)    1068    1068    1068  |    1100    0.00
- GET /cpython/changelog?page=48                                     1     0(0.00%)    1113    1113    1113  |    1100    0.00
- GET /cpython/changelog?page=49                                     1     0(0.00%)     948     948     948  |     950    0.00
- GET /cpython/changelog?page=5                                      5     0(0.00%)     567     329     846  |     450    0.00
- GET /cpython/changelog?page=50                                     1     0(0.00%)    1230    1230    1230  |    1200    0.00
- GET /cpython/changelog?page=51                                     2     0(0.00%)     899     855     944  |     860    0.00
- GET /cpython/changelog?page=52                                     2     0(0.00%)    1113     872    1355  |     870    0.00
- GET /cpython/changelog?page=53                                     1     0(0.00%)    1010    1010    1010  |    1000    0.00
- GET /cpython/changelog?page=54                                     2     0(0.00%)    1022     872    1173  |     870    0.10
- GET /cpython/changelog?page=55                                     2     0(0.00%)     875     803     947  |     800    0.20
- GET /cpython/changelog?page=56                                     1     0(0.00%)     434     434     434  |     430    0.10
- GET /cpython/changelog?page=57                                     1     0(0.00%)     791     791     791  |     790    0.10
- GET /cpython/changelog?page=58                                     1     0(0.00%)     665     665     665  |     670    0.00
- GET /cpython/changelog?page=6                                      4     0(0.00%)     519     280     709  |     450    0.00
- GET /cpython/changelog?page=7                                      4     0(0.00%)     576     201     992  |     550    0.00
- GET /cpython/changelog?page=8                                      3     0(0.00%)     732     331    1280  |     590    0.00
- GET /cpython/changelog?page=9                                      3     0(0.00%)     921     420    1689  |     650    0.00
- GET /cpython/changelog_summary?size=10&page=0                      1     0(0.00%)     379     379     379  |     380    0.00
- GET /cpython/changelog_summary?size=10&page=10                     1     0(0.00%)     500     500     500  |     500    0.00
- GET /cpython/changelog_summary?size=10&page=11                     2     0(0.00%)     293     248     338  |     250    0.00
- GET /cpython/changelog_summary?size=10&page=12                     1     0(0.00%)     408     408     408  |     410    0.00
- GET /cpython/changelog_summary?size=10&page=2                      3     0(0.00%)     770     188    1079  |    1000    0.00
- GET /cpython/changelog_summary?size=10&page=3                      3     0(0.00%)     718     379    1243  |     530    0.00
- GET /cpython/changelog_summary?size=10&page=4                      1     0(0.00%)     512     512     512  |     510    0.00
- GET /cpython/changelog_summary?size=10&page=5                      4     0(0.00%)     540     348     673  |     550    0.00
- GET /cpython/changelog_summary?size=10&page=6                      4     0(0.00%)     531     362     632  |     550    0.00
- GET /cpython/changelog_summary?size=10&page=7                      1     0(0.00%)     989     989     989  |     990    0.00
- GET /cpython/changelog_summary?size=10&page=8                      2     0(0.00%)    1226    1093    1360  |    1100    0.00
- GET /cpython/changelog_summary?size=10&page=9                      2     0(0.00%)     549     395     703  |     400    0.00
- GET /cpython/changeset/0045eec1e247c9b0855d5dd0ffa724068c43b8f7       1     0(0.00%)     570     570     570  |     570    0.00
- GET /cpython/changeset/014060738f7f89044fbe3a231b491daa69f7e366       1     0(0.00%)    1037    1037    1037  |    1000    0.00
- GET /cpython/changeset/02b25ec13c94e87e6e8ac2876455d776377a945a       1     0(0.00%)    1523    1523    1523  |    1500    0.00
- GET /cpython/changeset/04a2f86539b56c2161069691b586981c7e8db4d6       1     0(0.00%)    1400    1400    1400  |    1400    0.00
- GET /cpython/changeset/057a8bd043ea759ad7fbd25a90a942f8078efff4       1     0(0.00%)    1354    1354    1354  |    1400    0.00
- GET /cpython/changeset/05e8f92b58ff41bb4d710d80a0793728900674eb       1     0(0.00%)    1115    1115    1115  |    1100    0.00
- GET /cpython/changeset/0788d0d6bf85c32ea72a378a9aa9efa05430d089       1     0(0.00%)     284     284     284  |     280    0.00
- GET /cpython/changeset/0a4f286105b476a31870e36b4a4704bc2e11e541       1     0(0.00%)    1121    1121    1121  |    1100    0.00
- GET /cpython/changeset/0b477934e0a1a1f032010ee4f21261958bd65c14       1     0(0.00%)     247     247     247  |     250    0.00
- GET /cpython/changeset/0b79c702abda873c6f45a720f028bffeb87bb8d7       1     0(0.00%)    1445    1445    1445  |    1400    0.00
- GET /cpython/changeset/0c57aba6b1a320127340076300e23f90c0e21d44       2     0(0.00%)     698     450     947  |     450    0.00
- GET /cpython/changeset/17e1af9ad66c9a31fd22de3c9cf17c1ffc765422       1     0(0.00%)    1216    1216    1216  |    1200    0.00
- GET /cpython/changeset/1b3a5d63521cb9ecb045e78f79c443e8134d6038       1     0(0.00%)     833     833     833  |     830    0.00
- GET /cpython/changeset/1c48171fc8da0225f22f498b699ecb7f3f6db41d       1     0(0.00%)     384     384     384  |     380    0.00
- GET /cpython/changeset/263701e0b77e3160bc6a835087f838bd6b24092a       1     0(0.00%)    1407    1407    1407  |    1400    0.00
- GET /cpython/changeset/275da9f9d7d7c4049409d26b02786326a23e870d       1     0(0.00%)     733     733     733  |     730    0.00
- GET /cpython/changeset/27feb652d3add1391e9665b4362cae80c28dd508       1     0(0.00%)     704     704     704  |     700    0.00
- GET /cpython/changeset/294b598afbb6878a65cf36ea2ca7065b4684a7e8       3     0(0.00%)     457     366     597  |     410    0.00
- GET /cpython/changeset/29665ab293faf5d378445c0ed6889ee81702d0c9       2     0(0.00%)     764     493    1036  |     490    0.00
- GET /cpython/changeset/2b7a4cbed2a0ec4f9ab7afd9d0e9b9b492d25718       1     0(0.00%)     940     940     940  |     940    0.00
- GET /cpython/changeset/39f9cd7ad19abb1620268efff6d53e4d1521619d       1     0(0.00%)     973     973     973  |     970    0.00
- GET /cpython/changeset/3b5279b5bfd17666d5fd3729782c538cadf5a264       1     0(0.00%)     831     831     831  |     830    0.00
- GET /cpython/changeset/3b6b905ae229d2fa06268615c696a3a64aded264       2     0(0.00%)    1243     614    1873  |     610    0.00
- GET /cpython/changeset/3d45155b7b9bcfd00758f5fc11380e60aaf71d83       1     0(0.00%)     536     536     536  |     540    0.00
- GET /cpython/changeset/42ced0d023cd4e74f0317253491fc18f1a3c9d23       3     0(0.00%)    1080     840    1287  |    1100    0.00
- GET /cpython/changeset/438da6ae38faa5d3b0dc998c72ac10aeb3c7f268       1     0(0.00%)     810     810     810  |     810    0.00
- GET /cpython/changeset/452f9486a0114923caba8607673b931fab0f769d       1     0(0.00%)     752     752     752  |     750    0.00
- GET /cpython/changeset/45b208ae9eabfc335a2f3e8fa26606195bc62ecb       1     0(0.00%)     641     641     641  |     640    0.00
- GET /cpython/changeset/488daf4691f6171b61e8b7f7722fdfda742baa48       1     0(0.00%)     782     782     782  |     780    0.00
- GET /cpython/changeset/49085b7460291e4ce7e2113d02e28ea41eec752d       4     0(0.00%)     811     396    1075  |     830    0.00
- GET /cpython/changeset/4c0966b7dbe102f4ccf153e18bf669eab4f130cc       1     0(0.00%)     370     370     370  |     370    0.00
- GET /cpython/changeset/4d4a9094bdb008baaa9ccacfd654c3b0b90c38a0       1     0(0.00%)    1811    1811    1811  |    1800    0.00
- GET /cpython/changeset/4f359c631bb0f69c536cba1078421cf01c35b3ee       1     0(0.00%)    1125    1125    1125  |    1100    0.00
- GET /cpython/changeset/4fe27263f9d494ac8ab3a14a489a00d7f1289c34       1     0(0.00%)     964     964     964  |     960    0.00
- GET /cpython/changeset/5496bf8972b6f1f2b3d39baf6e6591363c4b79a7       1     0(0.00%)     590     590     590  |     590    0.00
- GET /cpython/changeset/5875c50e93fee1d3832cfa19933e0e9c8788c49b       1     0(0.00%)     872     872     872  |     870    0.00
- GET /cpython/changeset/58e0d2c3ead8ff3dfe0cb5a6f79c0f69dde281b7       1     0(0.00%)     991     991     991  |     990    0.00
- GET /cpython/changeset/5a157e3b3c47ed38e1f1f4c466f68c3c35585667       1     0(0.00%)     738     738     738  |     740    0.00
- GET /cpython/changeset/5a299c3ec12060de9d59dd0e0aff1ffb099115f6       1     0(0.00%)     762     762     762  |     760    0.00
- GET /cpython/changeset/5a58f6e793ccf17393c725e01b741c0fec5450f2       2     0(0.00%)     679     456     902  |     460    0.00
- GET /cpython/changeset/5ac811cbec879f87ca1c6f91f2bd9f3ead8f3a85       1     0(0.00%)    1034    1034    1034  |    1000    0.00
- GET /cpython/changeset/5c0fa5fd0fb59a87d639cac44aba2abed0569d7f       1     0(0.00%)    1370    1370    1370  |    1400    0.00
- GET /cpython/changeset/5c54f3818efd86d3269b71874e4bef76b352ee83       1     0(0.00%)     768     768     768  |     770    0.00
- GET /cpython/changeset/5c60dd51818286ce20c242ef4f3600421c711955       1     0(0.00%)    1339    1339    1339  |    1300    0.00
- GET /cpython/changeset/5c9b508e442f8e16307b62a1e9d1775a612f8172       1     0(0.00%)     446     446     446  |     450    0.00
- GET /cpython/changeset/619feea86ce4b63f358e62b0b8e132b7c6b7f17b       1     0(0.00%)     299     299     299  |     300    0.00
- GET /cpython/changeset/6298895a52de36edaf182316a1081ccdfebf134e       1     0(0.00%)     989     989     989  |     990    0.00
- GET /cpython/changeset/668f6938fb1cd72b5f2d58626b02eb8a81204eb3       1     0(0.00%)     480     480     480  |     480    0.00
- GET /cpython/changeset/691ca1694fe79f299478b0aa9acbe9a06254e65b       1     0(0.00%)     226     226     226  |     230    0.00
- GET /cpython/changeset/69783040dd543d748f7197fdf7d9e147ba9cbc71       1     0(0.00%)     470     470     470  |     470    0.00
- GET /cpython/changeset/6dd4c2d30b0e6c31506e5b11a9db081cd61fbdf7       1     0(0.00%)    1297    1297    1297  |    1300    0.00
- GET /cpython/changeset/71567539303222f1e59e10291205401a3ffba6a0       1     0(0.00%)     844     844     844  |     840    0.00
- GET /cpython/changeset/766570a5d6070488cbf5acf967c500088d1f4c17       1     0(0.00%)     440     440     440  |     440    0.00
- GET /cpython/changeset/7749d30d9caa81113f5a84578e55e5336251eb66       1     0(0.00%)     783     783     783  |     780    0.00
- GET /cpython/changeset/77fbbb5a73064ee17425b5fd8e6d68cf91ca33ab       1     0(0.00%)    1202    1202    1202  |    1200    0.00
- GET /cpython/changeset/78fc2465f11473a29963400617aa0e633e3f2cbf       1     0(0.00%)     560     560     560  |     560    0.00
- GET /cpython/changeset/78fff5310206ad496e79f936da351e52397c41af       1     0(0.00%)     852     852     852  |     850    0.00
- GET /cpython/changeset/79562a31e5a621fde97ed0f1b8700b6dfc58452b       1     0(0.00%)    1106    1106    1106  |    1100    0.10
- GET /cpython/changeset/7a1737033a23aae00da70dc8159322e46a7a6551       1     0(0.00%)     234     234     234  |     230    0.00
- GET /cpython/changeset/7c19f1f792c6c8d5a7e4c3e8d424318c3fe0663b       1     0(0.00%)     880     880     880  |     880    0.00
- GET /cpython/changeset/823f5507bd864cdb1899dbc05a42355bf7188728       1     0(0.00%)     699     699     699  |     700    0.00
- GET /cpython/changeset/833325d45113ca81b22a6ef8e753b8e2fe26b04c       1     0(0.00%)    1156    1156    1156  |    1200    0.00
- GET /cpython/changeset/897c9e6ddb1ac1d467d2bf700aecbc585c6e33ac       1     0(0.00%)     274     274     274  |     270    0.00
- GET /cpython/changeset/8b8b79e1f8626a69c3f2abccb2147e148d52173e       1     0(0.00%)    1375    1375    1375  |    1400    0.00
- GET /cpython/changeset/906df134924d7e71adcf65dea81ccaeb034cd530       3     0(0.00%)    1052     710    1236  |    1200    0.00
- GET /cpython/changeset/90db391ce7a5c7fd36c157703a9e5fe46578225e       1     0(0.00%)     682     682     682  |     680    0.00
- GET /cpython/changeset/90e3feac9a2dacd20a9bfb7bffb7b9147bf32ee7       3     0(0.00%)     660     513     752  |     720    0.00
- GET /cpython/changeset/92d691c3ca009b890bd844708ef60335424295f6       1     0(0.00%)    1007    1007    1007  |    1000    0.00
- GET /cpython/changeset/944fc499ccd30a5a4d868373b69d8585bd07cdf7       1     0(0.00%)     941     941     941  |     940    0.00
- GET /cpython/changeset/958e8bebda6d3ec7fee21e0ede5a871b1c818948       1     0(0.00%)     735     735     735  |     740    0.00
- GET /cpython/changeset/959fb56294ec20849884116b17b8ba102ef54bac       1     0(0.00%)     589     589     589  |     590    0.00
- GET /cpython/changeset/98a2e215ff0177436421b65de6d0e8221ad1d91f       1     0(0.00%)    1273    1273    1273  |    1300    0.00
- GET /cpython/changeset/9a84c335d8e11926ddd71366e6085cc7c168cc0c       1     0(0.00%)     410     410     410  |     410    0.00
- GET /cpython/changeset/9b450b19aa118c4888b6acc6ba5e8f0fb00aaa87       1     0(0.00%)     862     862     862  |     860    0.00
- GET /cpython/changeset/9cd3ab7c09d190c077c42dd9cbfe43feb697132b       1     0(0.00%)    1218    1218    1218  |    1200    0.00
- GET /cpython/changeset/a0ae1ac69925b3ae866c7e089e95400aa3681a42       1     0(0.00%)    1178    1178    1178  |    1200    0.00
- GET /cpython/changeset/a4095a895425ea48960b46d16aff2eed9d11943e       1     0(0.00%)     459     459     459  |     460    0.00
- GET /cpython/changeset/a74c48aa43eb5109351b49d8b1e420612389a2e8       2     0(0.00%)     420     250     590  |     250    0.00
- GET /cpython/changeset/a821cc06082b302451e829015e151151fd0964ac       1     0(0.00%)     695     695     695  |     700    0.00
- GET /cpython/changeset/a8db78d7b6574b425d6b1a38f55068761f5da2e7       1     0(0.00%)    1134    1134    1134  |    1100    0.00
- GET /cpython/changeset/a91f8766f75583d7dc0e6dfebff0fea056f15e56       1     0(0.00%)     668     668     668  |     670    0.00
- GET /cpython/changeset/a9637b29954d952ffcdde6bd76cd2202282427a0       1     0(0.00%)    1380    1380    1380  |    1400    0.00
- GET /cpython/changeset/ad7ac2a469e1e9858825a646ffcbce68aae8ed40       1     0(0.00%)     898     898     898  |     900    0.00
- GET /cpython/changeset/b05d4f3ee19050f681db045c0b5d39ef59c4841b       1     0(0.00%)     776     776     776  |     780    0.00
- GET /cpython/changeset/b1c82ef96862101642deb702e046763f09678c3f       1     0(0.00%)     371     371     371  |     370    0.00
- GET /cpython/changeset/b3aa30f474c4c5dd8f12c92c1156d7aa5393d72b       1     0(0.00%)     955     955     955  |     960    0.00
- GET /cpython/changeset/b57b4e3b83ffc69a0d364fd33f63c857425f3299       1     0(0.00%)     484     484     484  |     480    0.00
- GET /cpython/changeset/b63b8c5628da906d780207e322083e3c3de3afec       1     0(0.00%)     862     862     862  |     860    0.00
- GET /cpython/changeset/b7af119f78c3ff9dd53a90f91cdd4efcb8d8d49e       1     0(0.00%)     325     325     325  |     330    0.00
- GET /cpython/changeset/b82ff2d7f5efec2e8a8ba7b2b8e4b0d68901d859       1     0(0.00%)     604     604     604  |     600    0.00
- GET /cpython/changeset/b836a0cd68f7dc64d918c9d80e0e9793877f7dbe       2     0(0.00%)     573     254     893  |     250    0.00
- GET /cpython/changeset/ba141f9e58b658b151cb6d40086821296109e37c       1     0(0.00%)     536     536     536  |     540    0.00
- GET /cpython/changeset/bb28542af0601fd468ad60b584e4dd9de08faa4a       1     0(0.00%)     406     406     406  |     410    0.00
- GET /cpython/changeset/bc991d4f9ce70bdcc3da7cd0b1fe916a17a0a805       2     0(0.00%)    1140     768    1512  |     770    0.00
- GET /cpython/changeset/bda68f9732288de00e503979f2cae36e9a8096f1       1     0(0.00%)    1453    1453    1453  |    1500    0.00
- GET /cpython/changeset/bf0221ca3477f065583039133806ef6887e7b291       2     0(0.00%)     370     319     421  |     320    0.00
- GET /cpython/changeset/c48980af7df207e8c606e00c054eadb513f59d37       2     0(0.00%)     622     598     646  |     600    0.00
- GET /cpython/changeset/c8ce5bca0fcda4307f7ac5d69103ce128a562705       1     0(0.00%)    1136    1136    1136  |    1100    0.00
- GET /cpython/changeset/ca4a22256bf88452349c2ff54b90a4bd983cb72d       2     0(0.00%)     530     275     785  |     280    0.00
- GET /cpython/changeset/cb8fc24e209f91cfde35c698897797b7c729ef7f       2     0(0.00%)     843     373    1314  |     370    0.00
- GET /cpython/changeset/cdda2656ceae9d9807ff31ae796ac44aa652f6b0       1     0(0.00%)     860     860     860  |     860    0.00
- GET /cpython/changeset/ce50e5f724e9c1dbe81ddf36cb2134fce81faaa8       2     0(0.00%)    1023     527    1520  |     530    0.00
- GET /cpython/changeset/d002c4d60ed4cc6015662256d564070fa6981eb5       1     0(0.00%)     605     605     605  |     610    0.00
- GET /cpython/changeset/d2041159e8edcb34ccac5978754e7b4b6806b663       2     0(0.00%)    1033     884    1182  |     880    0.00
- GET /cpython/changeset/d4fed34877929b31a08e23ea7c686e6d5f9c56d5       2     0(0.00%)     583     320     846  |     320    0.00
- GET /cpython/changeset/d85fcf23549e002626618196d930d3c807d2b20e       1     0(0.00%)    1119    1119    1119  |    1100    0.00
- GET /cpython/changeset/d9da4b77624b522ce367a37d737acd208b3f793f       1     0(0.00%)    1059    1059    1059  |    1100    0.00
- GET /cpython/changeset/dac25d8ac95a7841879d17ac99394d561deea88d       1     0(0.00%)     391     391     391  |     390    0.00
- GET /cpython/changeset/db600c927b2b87537c5e71ce39d825675cfb5e63       1     0(0.00%)     575     575     575  |     580    0.00
- GET /cpython/changeset/dd064d4b739eb626f407d074bda5f860c4533bfe       1     0(0.00%)     868     868     868  |     870    0.00
- GET /cpython/changeset/dea18d1104b6f67a790e6ff62f483a27ca6e5123       2     0(0.00%)    1200    1110    1290  |    1100    0.00
- GET /cpython/changeset/e0510a3bdf8fa1bfe061f856ec5e5877cb26d259       1     0(0.00%)     857     857     857  |     860    0.00
- GET /cpython/changeset/e0561df131aaf6580523fbdb172239922e0026e9       1     0(0.00%)     838     838     838  |     840    0.00
- GET /cpython/changeset/e0f681f4ade3af52915d5f32daac97ada580d71a       4     0(0.00%)     732     265    1453  |     300    0.00
- GET /cpython/changeset/e205bce4cc0ac68e0255228e06d23a6e6632795d       1     0(0.00%)    1324    1324    1324  |    1300    0.00
- GET /cpython/changeset/e22d0ff286f9fa8b41b72420f165bad369312521       1     0(0.00%)     225     225     225  |     230    0.00
- GET /cpython/changeset/e6bb59b6b85c14f25582961abcdd6a2c7e16f487       1     0(0.00%)     579     579     579  |     580    0.00
- GET /cpython/changeset/e6be001c070b07bdcfaa1bec64b822d32400f309       1     0(0.00%)     890     890     890  |     890    0.00
- GET /cpython/changeset/eaddc617af1ea7f2137cd59255e9df366910be6e       1     0(0.00%)    1052    1052    1052  |    1100    0.00
- GET /cpython/changeset/ec2efc094d6245dbd0ce2a2fca394a15ee627888       2     0(0.00%)    1128    1109    1147  |    1100    0.00
- GET /cpython/changeset/eee636e3edbe117a552d637afc0bcaf88f5c42a9       1     0(0.00%)     994     994     994  |     990    0.00
- GET /cpython/changeset/efb0a3eb4e06e649d61dc9f96d3a8962974cf04f       2     0(0.00%)     881     863     900  |     860    0.00
- GET /cpython/changeset/f138a74ee6119403afdfb4b7f5e83d8c0f3c7f59       1     0(0.00%)     414     414     414  |     410    0.00
- GET /cpython/changeset/f3b9814fb81a8435f5bfe343ba2863537a237703       2     0(0.00%)     965     905    1025  |     910    0.00
- GET /cpython/changeset/f426bd85f8083504e09cb0dd670a8530f121a039       1     0(0.00%)     827     827     827  |     830    0.00
- GET /cpython/changeset/f574c7b18279bbb69942f4149e4fa429d589fd1c       1     0(0.00%)    1428    1428    1428  |    1400    0.00
- GET /cpython/changeset/fd5f7ce6b66ab58e0b8889f82a4845b3e0927bf5       2     0(0.00%)     524     280     769  |     280    0.00
- GET /cpython/changeset/fdfa15a9243c93e20366fb7e40747c556c3c43ba       1     0(0.00%)    3237    3237    3237  |    3200    0.00
- GET /cpython/changeset/ffbbd43d73426f19c1947d533fbeab805a85612a       1     0(0.00%)    1256    1256    1256  |    1300    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/       2     0(0.00%)    1024     885    1164  |     890    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Grammar       3     0(0.00%)     596     204     992  |     590    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Grammar/Grammar       2     0(0.00%)     616     607     625  |     610    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Makefile.pre.in       1     0(0.00%)    1549    1549    1549  |    1500    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc       3     0(0.00%)    2755    2083    3259  |    2900    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/ACKS       1     0(0.00%)     951     951     951  |     950    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/RPM       1     0(0.00%)    1126    1126    1126  |    1100    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/coverity_model.c       1     0(0.00%)    1076    1076    1076  |    1100    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/python-config.in       1     0(0.00%)    1063    1063    1063  |    1100    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/python-wing4.wpr       1     0(0.00%)     368     368     368  |     370    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/python-wing5.wpr       1     0(0.00%)    1029    1029    1029  |    1000    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/python.pc.in       1     0(0.00%)     733     733     733  |     730    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/PC       1     0(0.00%)    1452    1452    1452  |    1500    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Programs       1     0(0.00%)    1205    1205    1205  |    1200    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Programs/README       2     0(0.00%)     473     212     735  |     210    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Programs/python.c       1     0(0.00%)     430     430     430  |     430    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/README       1     0(0.00%)    1623    1623    1623  |    1600    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/install-sh       1     0(0.00%)    1072    1072    1072  |    1100    0.00
- GET /cpython/files/tip/                                            1     0(0.00%)    1676    1676    1676  |    1700    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/.hgtouch       1     0(0.00%)     309     309     309  |     310    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Grammar/Grammar       5     0(0.00%)     452     311     674  |     370    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Misc/NEWS       1     0(0.00%)     525     525     525  |     530    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Misc/coverity_model.c       1     0(0.00%)     618     618     618  |     620    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Misc/python-wing4.wpr       1     0(0.00%)     610     610     610  |     610    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Programs/README       1     0(0.00%)     405     405     405  |     410    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Programs/_freeze_importlib.c       5     0(0.00%)     421     186     916  |     280    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Programs/_testembed.c       1     0(0.00%)     512     512     512  |     510    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/config.sub       2     0(0.00%)     786     381    1191  |     380    0.00
- GET /git                                                           2     0(0.00%)    2276    1432    3120  |    1400    0.10
- GET /git/annotate/333b5fc1dbf59968868c108f0ef018f6a052f330/git-bisect.sh       1     0(0.00%)    3815    3815    3815  |    3800    0.00
- GET /git/annotate/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git/.gitignore       2     0(0.00%)    1158     959    1357  |     960    0.00
- GET /git/annotate/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git/Makefile       1     0(0.00%)    2278    2278    2278  |    2300    0.00
- GET /git/annotate/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git/gitk       1     0(0.00%)    1055    1055    1055  |    1100    0.00
- GET /git/annotate/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git/po/de.po       1     0(0.00%)    6939    6939    6939  |    6900    0.00
- GET /git/annotate/333b5fc1dbf59968868c108f0ef018f6a052f330/templates/info--exclude       1     0(0.00%)    1611    1611    1611  |    1600    0.00
- GET /git/annotate/333b5fc1dbf59968868c108f0ef018f6a052f330/walker.h       1     0(0.00%)    1733    1733    1733  |    1700    0.00
- GET /git/changelog?page=1                                          1     0(0.00%)    1895    1895    1895  |    1900    0.00
- GET /git/changelog?page=10                                         1     0(0.00%)    1625    1625    1625  |    1600    0.00
- GET /git/changelog?page=11                                         1     0(0.00%)    1705    1705    1705  |    1700    0.00
- GET /git/changelog?page=12                                         1     0(0.00%)    2978    2978    2978  |    3000    0.00
- GET /git/changelog?page=13                                         1     0(0.00%)    3444    3444    3444  |    3400    0.00
- GET /git/changelog?page=14                                         1     0(0.00%)    2669    2669    2669  |    2700    0.00
- GET /git/changelog?page=15                                         1     0(0.00%)    2434    2434    2434  |    2400    0.00
- GET /git/changelog?page=16                                         1     0(0.00%)    3245    3245    3245  |    3200    0.00
- GET /git/changelog?page=17                                         1     0(0.00%)    1878    1878    1878  |    1900    0.00
- GET /git/changelog?page=18                                         1     0(0.00%)    2589    2589    2589  |    2600    0.00
- GET /git/changelog?page=2                                          1     0(0.00%)    2246    2246    2246  |    2200    0.00
- GET /git/changelog?page=3                                          1     0(0.00%)    2801    2801    2801  |    2800    0.00
- GET /git/changelog?page=4                                          1     0(0.00%)    3448    3448    3448  |    3400    0.00
- GET /git/changelog?page=5                                          2     0(0.00%)    2505    2337    2673  |    2300    0.00
- GET /git/changelog?page=6                                          3     0(0.00%)    3466    2849    3782  |    3800    0.00
- GET /git/changelog?page=7                                          3     0(0.00%)    2506    2116    2987  |    2400    0.00
- GET /git/changelog?page=8                                          2     0(0.00%)    2193    2175    2212  |    2200    0.00
- GET /git/changelog?page=9                                          1     0(0.00%)    2201    2201    2201  |    2200    0.00
- GET /git/changelog_summary?size=10&page=2                          3     0(0.00%)    1033     655    1268  |    1200    0.10
- GET /git/changelog_summary?size=10&page=3                          3     0(0.00%)    1118     524    1534  |    1300    0.10
- GET /git/changelog_summary?size=10&page=4                          1     0(0.00%)    1108    1108    1108  |    1100    0.10
- GET /git/changelog_summary?size=10&page=5                          1     0(0.00%)     941     941     941  |     940    0.00
- GET /git/changeset/252e072e33117ded3a758af0985ac53b14685923        2     0(0.00%)    1019     830    1209  |     830    0.00
- GET /git/changeset/bfa668e72684c2661c0fde9f00946d5a9316c79e        1     0(0.00%)    1192    1192    1192  |    1200    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git       3     0(0.00%)     790     706     840  |     830    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git/.gitignore       3     0(0.00%)    1155     794    1464  |    1200    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git/Makefile       1     0(0.00%)     981     981     981  |     980    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git/po       2     0(0.00%)    3812    3784    3841  |    3800    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git/po/.gitignore       1     0(0.00%)     554     554     554  |     550    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git/po/hu.po       1     0(0.00%)    1119    1119    1119  |    1100    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git/po/sv.po       1     0(0.00%)    1064    1064    1064  |    1100    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/notes-utils.h       1     0(0.00%)     712     712     712  |     710    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/perl       1     0(0.00%)    2637    2637    2637  |    2600    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/perl/Git       1     0(0.00%)    1507    1507    1507  |    1500    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/quote.h       1     0(0.00%)     733     733     733  |     730    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/strbuf.h       1     0(0.00%)    1107    1107    1107  |    1100    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/templates       1     0(0.00%)    5632    5632    5632  |    5600    0.00
- GET /git/files/333b5fc1dbf59968868c108f0ef018f6a052f330/templates/hooks--prepare-commit-msg.sample       1     0(0.00%)     613     613     613  |     610    0.00
- GET /git/files/tip/                                                3     0(0.00%)   49279   48580   49734  |   50000    0.00
- GET /git/raw/333b5fc1dbf59968868c108f0ef018f6a052f330/git.rc       1     0(0.00%)     843     843     843  |     840    0.00
- GET /git/raw/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git/.gitignore       1     0(0.00%)     683     683     683  |     680    0.00
- GET /git/raw/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git/Makefile       1     0(0.00%)     631     631     631  |     630    0.00
- GET /git/raw/333b5fc1dbf59968868c108f0ef018f6a052f330/gitk-git/po/it.po       1     0(0.00%)     870     870     870  |     870    0.00
- GET /git/raw/333b5fc1dbf59968868c108f0ef018f6a052f330/list-objects.h       1     0(0.00%)     812     812     812  |     810    0.00
- GET /git/raw/333b5fc1dbf59968868c108f0ef018f6a052f330/perl/Git/I18N.pm       2     0(0.00%)    1029     931    1128  |     930    0.00
- GET /git/raw/333b5fc1dbf59968868c108f0ef018f6a052f330/templates/branches--       1     0(0.00%)     368     368     368  |     370    0.00
- GET /git/raw/333b5fc1dbf59968868c108f0ef018f6a052f330/templates/this--description       1     0(0.00%)     753     753     753  |     750    0.00
---------------------------------------------------------------------------------------------------------------------------------------------
- Total                                                            500     0(0.00%)                                       1.20
-
-
-RC Branch @5801 (with VCS2)
-+++++++++++++++++++++++++++
-
- Name                                                          # reqs      # fails     Avg     Min     Max  |  Median   req/s
---------------------------------------------------------------------------------------------------------------------------------------------
- GET /                                                              9     0(0.00%)     418     204     734  |     420    0.20
- POST /_admin/login?came_from=/                                     2     0(0.00%)     679     655     703  |     660    0.00
- GET /cpython                                                       2     0(0.00%)    1970    1927    2013  |    1900    0.00
- GET /cpython/annotate/{revision}/{path} [file_annotate]           12     0(0.00%)   19591    1457  109765  |   10000    0.00
- GET /cpython/changelog/?page={page}                              144     0(0.00%)    4549    2478    6852  |    4700    0.30
- GET /cpython/changelog_summary?page={page}                        25     0(0.00%)    1911    1134    2619  |    1900    0.00
- GET /cpython/changeset/{changeset}                               155     0(0.00%)    1032     520    1922  |    1000    0.30
- GET /cpython/file/{revision}/{path} [dir]                         12     0(0.00%)    3099     708    7210  |    3100    0.00
- GET /cpython/file/{revision}/{path} [file]                        14     0(0.00%)    1191     730    1679  |    1100    0.00
- GET /cpython/raw/{revision}/{path} [file_raw]                     18     0(0.00%)     710     432    1239  |     650    0.00
- GET /git                                                           2     0(0.00%)    2262     906    3619  |     910    0.10
- GET /git/annotate/{revision}/{path} [file_annotate]               17     0(0.00%)    3527     496   18817  |    1600    0.10
- GET /git/changelog/?page={page}                                   24     0(0.00%)    1958    1138    2685  |    2000    0.00
- GET /git/changelog_summary?page={page}                             7     0(0.00%)    1161     926    1601  |    1100    0.20
- GET /git/changeset/{changeset}                                     3     0(0.00%)     775     564     886  |     880    0.00
- GET /git/file/{revision}/{path} [dir]                             17     0(0.00%)   15398     773   47140  |    3300    0.00
- GET /git/file/{revision}/{path} [file]                            19     0(0.00%)     838     527    1354  |     790    0.00
- GET /git/raw/{revision}/{path} [file_raw]                         18     0(0.00%)     465     256     698  |     480    0.20
---------------------------------------------------------------------------------------------------------------------------------------------
- Total                                                            500     0(0.00%)                                       1.40
-
-
- Name                                                          # reqs      # fails     Avg     Min     Max  |  Median   req/s
---------------------------------------------------------------------------------------------------------------------------------------------
- GET /                                                              9     0(0.00%)     457     175     916  |     360    0.20
- POST /_admin/login?came_from=/                                     2     0(0.00%)     622     530     714  |     530    0.00
- GET /cpython                                                       2     0(0.00%)    2148    2029    2267  |    2000    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/.hgtags       2     0(0.00%)   10790   10557   11023  |   11000    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Grammar/Grammar       2     0(0.00%)   10247    9447   11047  |    9400    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Makefile.pre.in       1     0(0.00%)  108652  108652  108652  |  109000    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Misc/RPM/README       1     0(0.00%)    3652    3652    3652  |    3700    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Misc/valgrind-python.supp       1     0(0.00%)   37846   37846   37846  |   38000    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Programs/README       1     0(0.00%)    1241    1241    1241  |    1200    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Programs/_freeze_importlib.c       1     0(0.00%)   10121   10121   10121  |   10000    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Programs/_testembed.c       2     0(0.00%)   10322   10274   10370  |   10000    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Programs/python.c       1     0(0.00%)    7431    7431    7431  |    7400    0.00
- GET /cpython/changelog?page=1                                      6     0(0.00%)    4629    3215    5562  |    5100    0.00
- GET /cpython/changelog?page=10                                     3     0(0.00%)    3946    2958    5876  |    3000    0.00
- GET /cpython/changelog?page=11                                     5     0(0.00%)    4140    3180    5288  |    3900    0.00
- GET /cpython/changelog?page=12                                     7     0(0.00%)    3742    2651    5150  |    3800    0.00
- GET /cpython/changelog?page=13                                     6     0(0.00%)    3773    2980    5547  |    3300    0.00
- GET /cpython/changelog?page=14                                     4     0(0.00%)    5047    3554    6506  |    4600    0.00
- GET /cpython/changelog?page=15                                     3     0(0.00%)    4083    3481    5273  |    3500    0.00
- GET /cpython/changelog?page=16                                     2     0(0.00%)    4617    3348    5886  |    3300    0.00
- GET /cpython/changelog?page=17                                     2     0(0.00%)    5610    5529    5692  |    5500    0.00
- GET /cpython/changelog?page=18                                     2     0(0.00%)    4435    3253    5618  |    3300    0.00
- GET /cpython/changelog?page=19                                     4     0(0.00%)    4645    3749    5533  |    4200    0.00
- GET /cpython/changelog?page=2                                      4     0(0.00%)    3889    2837    5693  |    3200    0.00
- GET /cpython/changelog?page=20                                     5     0(0.00%)    5010    4095    5874  |    4900    0.00
- GET /cpython/changelog?page=21                                     3     0(0.00%)    4414    3458    5706  |    4100    0.00
- GET /cpython/changelog?page=22                                     3     0(0.00%)    4975    4356    5331  |    5200    0.00
- GET /cpython/changelog?page=23                                     3     0(0.00%)    4502    3962    5116  |    4400    0.00
- GET /cpython/changelog?page=24                                     2     0(0.00%)    5052    4627    5478  |    4600    0.00
- GET /cpython/changelog?page=25                                     2     0(0.00%)    5823    5346    6301  |    5300    0.00
- GET /cpython/changelog?page=26                                     8     0(0.00%)    4373    2688    5867  |    4500    0.10
- GET /cpython/changelog?page=27                                     9     0(0.00%)    4064    2703    5463  |    4100    0.10
- GET /cpython/changelog?page=28                                     4     0(0.00%)    4446    3327    5999  |    3800    0.00
- GET /cpython/changelog?page=29                                     3     0(0.00%)    4126    3591    4415  |    4400    0.00
- GET /cpython/changelog?page=3                                      4     0(0.00%)    4299    3510    5200  |    4000    0.00
- GET /cpython/changelog?page=30                                     1     0(0.00%)    4687    4687    4687  |    4700    0.00
- GET /cpython/changelog?page=31                                     1     0(0.00%)    4753    4753    4753  |    4800    0.00
- GET /cpython/changelog?page=32                                     1     0(0.00%)    3848    3848    3848  |    3800    0.00
- GET /cpython/changelog?page=33                                     3     0(0.00%)    5279    4866    5849  |    5100    0.00
- GET /cpython/changelog?page=34                                     4     0(0.00%)    4646    3155    5978  |    4400    0.00
- GET /cpython/changelog?page=35                                     2     0(0.00%)    4810    4499    5121  |    4500    0.00
- GET /cpython/changelog?page=36                                     1     0(0.00%)    3048    3048    3048  |    3000    0.00
- GET /cpython/changelog?page=37                                     3     0(0.00%)    4551    3992    5221  |    4400    0.00
- GET /cpython/changelog?page=38                                     3     0(0.00%)    4681    3539    6230  |    4300    0.00
- GET /cpython/changelog?page=39                                     1     0(0.00%)    3552    3552    3552  |    3600    0.00
- GET /cpython/changelog?page=4                                      5     0(0.00%)    4647    4098    5166  |    4700    0.00
- GET /cpython/changelog?page=40                                     1     0(0.00%)    4581    4581    4581  |    4600    0.00
- GET /cpython/changelog?page=41                                     1     0(0.00%)    4486    4486    4486  |    4500    0.00
- GET /cpython/changelog?page=42                                     1     0(0.00%)    3651    3651    3651  |    3700    0.00
- GET /cpython/changelog?page=43                                     2     0(0.00%)    3274    2789    3760  |    2800    0.10
- GET /cpython/changelog?page=44                                     2     0(0.00%)    3262    3136    3388  |    3100    0.10
- GET /cpython/changelog?page=5                                      5     0(0.00%)    4439    3113    5673  |    4600    0.00
- GET /cpython/changelog?page=6                                      4     0(0.00%)    4864    3543    5763  |    4600    0.00
- GET /cpython/changelog?page=7                                      4     0(0.00%)    4824    4526    5376  |    4600    0.00
- GET /cpython/changelog?page=8                                      3     0(0.00%)    3840    2725    5503  |    3300    0.00
- GET /cpython/changelog?page=9                                      3     0(0.00%)    4628    3879    5564  |    4400    0.00
- GET /cpython/changelog_summary?size=10&page=0                      1     0(0.00%)    2371    2371    2371  |    2400    0.00
- GET /cpython/changelog_summary?size=10&page=10                     1     0(0.00%)    1693    1693    1693  |    1700    0.00
- GET /cpython/changelog_summary?size=10&page=11                     2     0(0.00%)    2128    1947    2309  |    1900    0.00
- GET /cpython/changelog_summary?size=10&page=12                     1     0(0.00%)    1723    1723    1723  |    1700    0.00
- GET /cpython/changelog_summary?size=10&page=2                      3     0(0.00%)    1918    1597    2122  |    2000    0.00
- GET /cpython/changelog_summary?size=10&page=3                      3     0(0.00%)    1728    1096    2084  |    2000    0.00
- GET /cpython/changelog_summary?size=10&page=4                      1     0(0.00%)    2098    2098    2098  |    2100    0.00
- GET /cpython/changelog_summary?size=10&page=5                      4     0(0.00%)    1669    1108    2105  |    1500    0.00
- GET /cpython/changelog_summary?size=10&page=6                      4     0(0.00%)    1860    1700    2021  |    1900    0.00
- GET /cpython/changelog_summary?size=10&page=7                      1     0(0.00%)    1566    1566    1566  |    1600    0.00
- GET /cpython/changelog_summary?size=10&page=8                      2     0(0.00%)    1962    1871    2054  |    1900    0.00
- GET /cpython/changelog_summary?size=10&page=9                      2     0(0.00%)    1713    1589    1838  |    1600    0.00
- GET /cpython/changeset/0039154be0c0298e68c80cc721e51b50ce238ec8       1     0(0.00%)    1306    1306    1306  |    1300    0.00
- GET /cpython/changeset/0045eec1e247c9b0855d5dd0ffa724068c43b8f7       2     0(0.00%)     901     502    1301  |     500    0.00
- GET /cpython/changeset/014060738f7f89044fbe3a231b491daa69f7e366       1     0(0.00%)     972     972     972  |     970    0.00
- GET /cpython/changeset/01ec8bb7187f9d6849ce566062e47afe48fabef9       1     0(0.00%)    1098    1098    1098  |    1100    0.00
- GET /cpython/changeset/02b25ec13c94e87e6e8ac2876455d776377a945a       1     0(0.00%)     933     933     933  |     930    0.00
- GET /cpython/changeset/057a8bd043ea759ad7fbd25a90a942f8078efff4       2     0(0.00%)    1232    1180    1284  |    1200    0.00
- GET /cpython/changeset/05e8f92b58ff41bb4d710d80a0793728900674eb       1     0(0.00%)    1275    1275    1275  |    1300    0.00
- GET /cpython/changeset/0788d0d6bf85c32ea72a378a9aa9efa05430d089       1     0(0.00%)    1031    1031    1031  |    1000    0.00
- GET /cpython/changeset/0b477934e0a1a1f032010ee4f21261958bd65c14       1     0(0.00%)    1009    1009    1009  |    1000    0.00
- GET /cpython/changeset/0b79c702abda873c6f45a720f028bffeb87bb8d7       1     0(0.00%)    1197    1197    1197  |    1200    0.00
- GET /cpython/changeset/0c2792a8f9db14ed6d5c67d557af3ed64aa83ba0       3     0(0.00%)     919     718    1031  |    1000    0.00
- GET /cpython/changeset/0c57aba6b1a320127340076300e23f90c0e21d44       2     0(0.00%)    1156    1117    1195  |    1100    0.00
- GET /cpython/changeset/0fef0afb9d198b747194d259b8d3dad2b8f4dfc4       1     0(0.00%)    1529    1529    1529  |    1500    0.00
- GET /cpython/changeset/1c48171fc8da0225f22f498b699ecb7f3f6db41d       2     0(0.00%)     792     537    1047  |     540    0.00
- GET /cpython/changeset/1c7567ec6292238ec80c1bca7b81d3088972cbfb       1     0(0.00%)     957     957     957  |     960    0.00
- GET /cpython/changeset/1db5cde4958f5a80d8236a6244cf99fe8b4987e5       1     0(0.00%)    1008    1008    1008  |    1000    0.00
- GET /cpython/changeset/221a1f9155e2a8b4d12015261b83a2ce3a0c62a2       2     0(0.00%)    1165     999    1331  |    1000    0.00
- GET /cpython/changeset/263701e0b77e3160bc6a835087f838bd6b24092a       1     0(0.00%)    1051    1051    1051  |    1100    0.00
- GET /cpython/changeset/26afcb8a87b95e9bba8348528d3876c4851b1184       1     0(0.00%)    1436    1436    1436  |    1400    0.00
- GET /cpython/changeset/275d02865d11b517bb0c132bf4c345b858a3882c       1     0(0.00%)    1342    1342    1342  |    1300    0.00
- GET /cpython/changeset/275da9f9d7d7c4049409d26b02786326a23e870d       1     0(0.00%)     402     402     402  |     400    0.00
- GET /cpython/changeset/294b598afbb6878a65cf36ea2ca7065b4684a7e8       3     0(0.00%)    1096     955    1200  |    1100    0.00
- GET /cpython/changeset/2ae5709692ef6afed4c3602a75f3a7bc578303cc       1     0(0.00%)     998     998     998  |    1000    0.00
- GET /cpython/changeset/2e0a98178c07e4e5989c6e0f8270d98f4fd5579a       1     0(0.00%)    1381    1381    1381  |    1400    0.00
- GET /cpython/changeset/2f2c1816d0c7a2897bc5d36ea5bdd415e730fdc1       2     0(0.00%)     986     854    1118  |     850    0.00
- GET /cpython/changeset/3435c5865cfcb4d31a48c13097176f6abe4a4289       1     0(0.00%)    1202    1202    1202  |    1200    0.00
- GET /cpython/changeset/345ce3d2986a5976016d57c97f67c253cdc2f616       1     0(0.00%)    1039    1039    1039  |    1000    0.00
- GET /cpython/changeset/38688f0a0e047e6702048f59247cd4a85e8e350e       1     0(0.00%)     406     406     406  |     410    0.00
- GET /cpython/changeset/3b6b905ae229d2fa06268615c696a3a64aded264       1     0(0.00%)    1319    1319    1319  |    1300    0.00
- GET /cpython/changeset/404cf4c071c8f84e68857afaa7fa4cf6f55804e1       1     0(0.00%)    1234    1234    1234  |    1200    0.00
- GET /cpython/changeset/410439e94a40316b56564ba4fd47f4d28c34f783       1     0(0.00%)     574     574     574  |     570    0.00
- GET /cpython/changeset/438da6ae38faa5d3b0dc998c72ac10aeb3c7f268       1     0(0.00%)     820     820     820  |     820    0.00
- GET /cpython/changeset/45dcdd8f32118a433e5e3dcc7b356006cd2a486f       1     0(0.00%)    1093    1093    1093  |    1100    0.00
- GET /cpython/changeset/49085b7460291e4ce7e2113d02e28ea41eec752d       2     0(0.00%)     897     817     977  |     820    0.00
- GET /cpython/changeset/49cdb04bfcc6f1245aee9254229d8e01d3ef4293       1     0(0.00%)    1359    1359    1359  |    1400    0.00
- GET /cpython/changeset/4be39be5230c07ba57986df7e13690777905ad1b       2     0(0.00%)    1223    1185    1261  |    1200    0.00
- GET /cpython/changeset/4d3f960c26f5eadb2346081aee8e87b07b2e30c5       1     0(0.00%)     414     414     414  |     410    0.00
- GET /cpython/changeset/4ef517041573969a1f58d3ed512f3395673c1587       1     0(0.00%)     956     956     956  |     960    0.00
- GET /cpython/changeset/4f359c631bb0f69c536cba1078421cf01c35b3ee       2     0(0.00%)     987     938    1037  |     940    0.00
- GET /cpython/changeset/50527a1b769c2e4323511cbdcbdf4e66a779ac99       1     0(0.00%)     856     856     856  |     860    0.00
- GET /cpython/changeset/50c995bdc00a3fb6941d6c946e4e16bc26fe93be       1     0(0.00%)    1038    1038    1038  |    1000    0.00
- GET /cpython/changeset/5496bf8972b6f1f2b3d39baf6e6591363c4b79a7       1     0(0.00%)    1013    1013    1013  |    1000    0.00
- GET /cpython/changeset/57740d19f5c2c063231d1d2898b940fd16f13355       1     0(0.00%)     752     752     752  |     750    0.00
- GET /cpython/changeset/58e0d2c3ead8ff3dfe0cb5a6f79c0f69dde281b7       1     0(0.00%)    1106    1106    1106  |    1100    0.00
- GET /cpython/changeset/5a157e3b3c47ed38e1f1f4c466f68c3c35585667       1     0(0.00%)     808     808     808  |     810    0.00
- GET /cpython/changeset/5a58f6e793ccf17393c725e01b741c0fec5450f2       1     0(0.00%)     989     989     989  |     990    0.00
- GET /cpython/changeset/5ac811cbec879f87ca1c6f91f2bd9f3ead8f3a85       1     0(0.00%)     988     988     988  |     990    0.00
- GET /cpython/changeset/6219aa966a5fb7572502646377cc8d67c45697fb       1     0(0.00%)     821     821     821  |     820    0.00
- GET /cpython/changeset/6298895a52de36edaf182316a1081ccdfebf134e       1     0(0.00%)    1159    1159    1159  |    1200    0.00
- GET /cpython/changeset/65018d952340acda44c20baee75184a696dd1887       1     0(0.00%)    1219    1219    1219  |    1200    0.00
- GET /cpython/changeset/66c7f30fe8c7943ff09500d9ccb4836a15dedec1       1     0(0.00%)    1238    1238    1238  |    1200    0.00
- GET /cpython/changeset/69783040dd543d748f7197fdf7d9e147ba9cbc71       1     0(0.00%)    1272    1272    1272  |    1300    0.00
- GET /cpython/changeset/6a71d3c796532cab3f2661e134bbf28ae9902435       2     0(0.00%)     900     554    1247  |     550    0.00
- GET /cpython/changeset/6cbb97f039bdb1b63469c76e759d149d4e6841de       1     0(0.00%)    1059    1059    1059  |    1100    0.00
- GET /cpython/changeset/6d41f139709b7c77293f9d71f2316b790ebecc21       1     0(0.00%)     990     990     990  |     990    0.00
- GET /cpython/changeset/6e67a0394957f1756269defbaab505b45524b853       1     0(0.00%)     811     811     811  |     810    0.00
- GET /cpython/changeset/734d5ab0ce6ac6333a35e98a014f49ea3b0205cb       1     0(0.00%)     870     870     870  |     870    0.00
- GET /cpython/changeset/7640af73c19d5ebe409ad8aa41aa2eb5b8f6dac1       2     0(0.00%)    1114    1099    1129  |    1100    0.00
- GET /cpython/changeset/766570a5d6070488cbf5acf967c500088d1f4c17       1     0(0.00%)    1145    1145    1145  |    1100    0.00
- GET /cpython/changeset/7749d30d9caa81113f5a84578e55e5336251eb66       1     0(0.00%)    1169    1169    1169  |    1200    0.00
- GET /cpython/changeset/77fbbb5a73064ee17425b5fd8e6d68cf91ca33ab       1     0(0.00%)    1051    1051    1051  |    1100    0.00
- GET /cpython/changeset/7bc53cf8b2dfb0a9fe4dfb1bb08e26d8dce04eba       1     0(0.00%)    1336    1336    1336  |    1300    0.00
- GET /cpython/changeset/7c19f1f792c6c8d5a7e4c3e8d424318c3fe0663b       1     0(0.00%)     776     776     776  |     780    0.00
- GET /cpython/changeset/7ed237478fcc3695d2b95b861efcff0a43a023e5       3     0(0.00%)     856     772     992  |     810    0.00
- GET /cpython/changeset/7f8843ec34ee4049493b58882cb7165d5e268f9b       1     0(0.00%)     987     987     987  |     990    0.00
- GET /cpython/changeset/8039a20b18cc17fdbbc91758746e6344948022e4       1     0(0.00%)     689     689     689  |     690    0.00
- GET /cpython/changeset/8106f91fccd66f1306426e190e684e395b9d3132       1     0(0.00%)     911     911     911  |     910    0.00
- GET /cpython/changeset/823f5507bd864cdb1899dbc05a42355bf7188728       1     0(0.00%)    1114    1114    1114  |    1100    0.00
- GET /cpython/changeset/855ff9182a0778ba1e20af6fc043d27591d66d80       2     0(0.00%)    1041    1001    1081  |    1000    0.10
- GET /cpython/changeset/87f940e85cb0e48208ca25a87b5b58cb6cfb886e       1     0(0.00%)     667     667     667  |     670    0.00
- GET /cpython/changeset/88a532a31eb383dd19a43d0a3c4c9841f84fd88f       2     0(0.00%)    1059    1047    1072  |    1000    0.00
- GET /cpython/changeset/897c9e6ddb1ac1d467d2bf700aecbc585c6e33ac       1     0(0.00%)     904     904     904  |     900    0.00
- GET /cpython/changeset/8b8b79e1f8626a69c3f2abccb2147e148d52173e       1     0(0.00%)     918     918     918  |     920    0.00
- GET /cpython/changeset/92d691c3ca009b890bd844708ef60335424295f6       1     0(0.00%)     934     934     934  |     930    0.00
- GET /cpython/changeset/944fc499ccd30a5a4d868373b69d8585bd07cdf7       1     0(0.00%)     905     905     905  |     910    0.00
- GET /cpython/changeset/958e8bebda6d3ec7fee21e0ede5a871b1c818948       1     0(0.00%)    1034    1034    1034  |    1000    0.10
- GET /cpython/changeset/962c1fefc34af9db3110c9c6538e5cdb39c170de       1     0(0.00%)    1289    1289    1289  |    1300    0.00
- GET /cpython/changeset/97ed0b51bbc078cd5a836932422a7517af6fa8aa       1     0(0.00%)     999     999     999  |    1000    0.00
- GET /cpython/changeset/9b450b19aa118c4888b6acc6ba5e8f0fb00aaa87       1     0(0.00%)    1002    1002    1002  |    1000    0.00
- GET /cpython/changeset/9e3c367b45a189e941eb3a772964a54b5b7574d5       1     0(0.00%)     876     876     876  |     880    0.00
- GET /cpython/changeset/a0ae1ac69925b3ae866c7e089e95400aa3681a42       1     0(0.00%)     993     993     993  |     990    0.00
- GET /cpython/changeset/a62368778d6cd0c6473f149f8d850dcce7f31031       1     0(0.00%)     912     912     912  |     910    0.00
- GET /cpython/changeset/a74c48aa43eb5109351b49d8b1e420612389a2e8       1     0(0.00%)    1005    1005    1005  |    1000    0.00
- GET /cpython/changeset/a77dc87a34fffe2b6899fa6b5a8f5b226e9bf952       1     0(0.00%)    1188    1188    1188  |    1200    0.00
- GET /cpython/changeset/a8db78d7b6574b425d6b1a38f55068761f5da2e7       1     0(0.00%)    1282    1282    1282  |    1300    0.00
- GET /cpython/changeset/a9637b29954d952ffcdde6bd76cd2202282427a0       1     0(0.00%)    1212    1212    1212  |    1200    0.00
- GET /cpython/changeset/aa059a8fb55a957b84bbe471bab74514adf23ee4       1     0(0.00%)    1189    1189    1189  |    1200    0.00
- GET /cpython/changeset/ad7ac2a469e1e9858825a646ffcbce68aae8ed40       2     0(0.00%)     922     873     971  |     870    0.00
- GET /cpython/changeset/afd64e6606288447e75ad8031cf72112f47b5dba       1     0(0.00%)    1230    1230    1230  |    1200    0.00
- GET /cpython/changeset/b08921c7d1ecfa43aa47f3453a87f705e9b92af8       1     0(0.00%)     686     686     686  |     690    0.00
- GET /cpython/changeset/b1c82ef96862101642deb702e046763f09678c3f       1     0(0.00%)    1073    1073    1073  |    1100    0.00
- GET /cpython/changeset/b3aa30f474c4c5dd8f12c92c1156d7aa5393d72b       1     0(0.00%)    1067    1067    1067  |    1100    0.00
- GET /cpython/changeset/b5114747d3edb248c91f0da90d10f0bcf9514630       1     0(0.00%)    1066    1066    1066  |    1100    0.00
- GET /cpython/changeset/b94da2b69d13ecc9f8c13ad74c411409edd56ca5       2     0(0.00%)     976     849    1104  |     850    0.00
- GET /cpython/changeset/b957f475e41eaae8678c092b326b42579a5d2de6       1     0(0.00%)    1015    1015    1015  |    1000    0.00
- GET /cpython/changeset/bc991d4f9ce70bdcc3da7cd0b1fe916a17a0a805       2     0(0.00%)     804     650     958  |     650    0.00
- GET /cpython/changeset/c173a34f20c02bb5a188fa80ccdcf1b5fc7e551e       1     0(0.00%)    1079    1079    1079  |    1100    0.00
- GET /cpython/changeset/c1edc4e43eb103254c5d96f1708542623fe08f17       1     0(0.00%)     911     911     911  |     910    0.00
- GET /cpython/changeset/c48980af7df207e8c606e00c054eadb513f59d37       2     0(0.00%)     724     687     762  |     690    0.00
- GET /cpython/changeset/c4f053f1b47f9a63eb8bfb13bac2a5674e2ef999       1     0(0.00%)    1019    1019    1019  |    1000    0.00
- GET /cpython/changeset/c755a3b58fa6d98b0c68e309d3299cdc52c34ba9       1     0(0.00%)     955     955     955  |     960    0.00
- GET /cpython/changeset/c8ce5bca0fcda4307f7ac5d69103ce128a562705       1     0(0.00%)    1109    1109    1109  |    1100    0.00
- GET /cpython/changeset/ca4a22256bf88452349c2ff54b90a4bd983cb72d       2     0(0.00%)     733     717     749  |     720    0.00
- GET /cpython/changeset/d4b035c9fb7df8750d86f27702b41ee190ba4cb3       1     0(0.00%)     978     978     978  |     980    0.00
- GET /cpython/changeset/d775fa9a97678fb93eef1396bf67832f872abbfd       1     0(0.00%)     427     427     427  |     430    0.00
- GET /cpython/changeset/d85fcf23549e002626618196d930d3c807d2b20e       1     0(0.00%)     879     879     879  |     880    0.00
- GET /cpython/changeset/d9607a71456e0ff635251fcb9ac09369cb0a4b89       1     0(0.00%)     956     956     956  |     960    0.00
- GET /cpython/changeset/d99014320220951707f79d114ae33f8c5a372a87       1     0(0.00%)     943     943     943  |     940    0.00
- GET /cpython/changeset/d9da4b77624b522ce367a37d737acd208b3f793f       1     0(0.00%)    1178    1178    1178  |    1200    0.00
- GET /cpython/changeset/db600c927b2b87537c5e71ce39d825675cfb5e63       1     0(0.00%)     894     894     894  |     890    0.00
- GET /cpython/changeset/dce9dbc8e8924582d3ddb3b18f40d712c30631ea       1     0(0.00%)     771     771     771  |     770    0.10
- GET /cpython/changeset/e0561df131aaf6580523fbdb172239922e0026e9       1     0(0.00%)    1324    1324    1324  |    1300    0.00
- GET /cpython/changeset/e0f681f4ade3af52915d5f32daac97ada580d71a       5     0(0.00%)    1081     629    1473  |    1100    0.00
- GET /cpython/changeset/e405bcbf761cc79afddc60045d7e94af6d2e144f       1     0(0.00%)     906     906     906  |     910    0.00
- GET /cpython/changeset/e6bb59b6b85c14f25582961abcdd6a2c7e16f487       1     0(0.00%)     837     837     837  |     840    0.00
- GET /cpython/changeset/e6be82fbc02519c1b61399bfd204d61489163eeb       1     0(0.00%)    1285    1285    1285  |    1300    0.00
- GET /cpython/changeset/e750d2b44c1d4692545661fd325960b17fbe6fe6       1     0(0.00%)     690     690     690  |     690    0.00
- GET /cpython/changeset/eafe4007c999f277bc84038af21d65fb6ea1aec8       1     0(0.00%)    1207    1207    1207  |    1200    0.00
- GET /cpython/changeset/ebd6f7f7859f05efb66ee99fd22516d61b720afe       1     0(0.00%)    1037    1037    1037  |    1000    0.00
- GET /cpython/changeset/ec2efc094d6245dbd0ce2a2fca394a15ee627888       1     0(0.00%)     875     875     875  |     880    0.00
- GET /cpython/changeset/eee636e3edbe117a552d637afc0bcaf88f5c42a9       1     0(0.00%)     874     874     874  |     870    0.00
- GET /cpython/changeset/efb0a3eb4e06e649d61dc9f96d3a8962974cf04f       1     0(0.00%)     514     514     514  |     510    0.00
- GET /cpython/changeset/f0a5be139717b166a72db1e713d97006b191c746       1     0(0.00%)     980     980     980  |     980    0.00
- GET /cpython/changeset/f0ab6f9f06036dfacff09f22f86464840b50eb0a       3     0(0.00%)     881     562    1051  |    1000    0.00
- GET /cpython/changeset/f5df571bfe1d66406c0171cd59cf0da9708d345c       1     0(0.00%)     982     982     982  |     980    0.00
- GET /cpython/changeset/fc7f28b11d208f0e4716cbb0f7068901e7d65046       1     0(0.00%)     940     940     940  |     940    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/       2     0(0.00%)    3681    3579    3783  |    3600    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Grammar       3     0(0.00%)    1130    1080    1212  |    1100    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Grammar/Grammar       2     0(0.00%)    1242    1189    1296  |    1200    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Makefile.pre.in       1     0(0.00%)    1216    1216    1216  |    1200    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc       3     0(0.00%)    4547    4029    4970  |    4600    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/ACKS       1     0(0.00%)     575     575     575  |     580    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/RPM       1     0(0.00%)    1437    1437    1437  |    1400    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/coverity_model.c       1     0(0.00%)     822     822     822  |     820    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/python-config.in       1     0(0.00%)    1125    1125    1125  |    1100    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/python-wing4.wpr       1     0(0.00%)    1157    1157    1157  |    1200    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/python-wing5.wpr       1     0(0.00%)     989     989     989  |     990    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/python.pc.in       1     0(0.00%)     928     928     928  |     930    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/PC       1     0(0.00%)    7186    7186    7186  |    7200    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Programs       1     0(0.00%)    1520    1520    1520  |    1500    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Programs/README       2     0(0.00%)    1168    1082    1255  |    1100    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Programs/python.c       1     0(0.00%)    1258    1258    1258  |    1300    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/README       1     0(0.00%)     853     853     853  |     850    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/install-sh       1     0(0.00%)    1392    1392    1392  |    1400    0.00
- GET /cpython/files/tip/                                            1     0(0.00%)    3070    3070    3070  |    3100    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/.hgtouch       1     0(0.00%)     730     730     730  |     730    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Grammar/Grammar       5     0(0.00%)     776     584    1062  |     730    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Misc/NEWS       1     0(0.00%)     892     892     892  |     890    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Misc/coverity_model.c       1     0(0.00%)     728     728     728  |     730    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Misc/python-wing4.wpr       1     0(0.00%)     528     528     528  |     530    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Programs/README       1     0(0.00%)     677     677     677  |     680    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Programs/_freeze_importlib.c       5     0(0.00%)     845     729     988  |     810    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Programs/_testembed.c       1     0(0.00%)     458     458     458  |     460    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/config.sub       2     0(0.00%)     679     462     897  |     460    0.00
- GET /git                                                           2     0(0.00%)    2232     792    3673  |     790    0.10
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/builtin/mktag.c       1     0(0.00%)    4663    4663    4663  |    4700    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/compat/strlcpy.c       1     0(0.00%)    1707    1707    1707  |    1700    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/gettext.h       1     0(0.00%)    2689    2689    2689  |    2700    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/git-am.sh       1     0(0.00%)   14322   14322   14322  |   14000    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/.gitignore       2     0(0.00%)    1071    1021    1121  |    1000    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/Makefile       1     0(0.00%)    2254    2254    2254  |    2300    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/gitk       3     0(0.00%)     821     627    1098  |     740    0.10
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/po/de.po       1     0(0.00%)   18742   18742   18742  |   19000    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/patch-ids.c       1     0(0.00%)    2829    2829    2829  |    2800    0.10
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/pathspec.h       1     0(0.00%)    2283    2283    2283  |    2300    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/reflog-walk.h       1     0(0.00%)    2146    2146    2146  |    2100    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/templates/info--exclude       1     0(0.00%)    1319    1319    1319  |    1300    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/test-mktemp.c       1     0(0.00%)    1711    1711    1711  |    1700    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/wildmatch.c       1     0(0.00%)    5524    5524    5524  |    5500    0.00
- GET /git/changelog?page=1                                          1     0(0.00%)    1913    1913    1913  |    1900    0.00
- GET /git/changelog?page=10                                         1     0(0.00%)    1809    1809    1809  |    1800    0.00
- GET /git/changelog?page=11                                         1     0(0.00%)    2183    2183    2183  |    2200    0.00
- GET /git/changelog?page=12                                         1     0(0.00%)    1926    1926    1926  |    1900    0.00
- GET /git/changelog?page=13                                         1     0(0.00%)    1582    1582    1582  |    1600    0.00
- GET /git/changelog?page=14                                         1     0(0.00%)    1846    1846    1846  |    1800    0.00
- GET /git/changelog?page=15                                         1     0(0.00%)    1555    1555    1555  |    1600    0.00
- GET /git/changelog?page=16                                         1     0(0.00%)    1884    1884    1884  |    1900    0.00
- GET /git/changelog?page=17                                         1     0(0.00%)    1921    1921    1921  |    1900    0.00
- GET /git/changelog?page=18                                         1     0(0.00%)    1930    1930    1930  |    1900    0.00
- GET /git/changelog?page=2                                          1     0(0.00%)    2007    2007    2007  |    2000    0.00
- GET /git/changelog?page=3                                          1     0(0.00%)    1985    1985    1985  |    2000    0.00
- GET /git/changelog?page=4                                          1     0(0.00%)    1756    1756    1756  |    1800    0.00
- GET /git/changelog?page=5                                          2     0(0.00%)    2035    1836    2234  |    1800    0.00
- GET /git/changelog?page=6                                          3     0(0.00%)    1728    1567    1877  |    1700    0.00
- GET /git/changelog?page=7                                          3     0(0.00%)    1847    1674    1974  |    1900    0.00
- GET /git/changelog?page=8                                          2     0(0.00%)    1814    1550    2079  |    1600    0.00
- GET /git/changelog?page=9                                          1     0(0.00%)    1903    1903    1903  |    1900    0.00
- GET /git/changelog_summary?size=10&page=2                          3     0(0.00%)     925     798    1136  |     840    0.00
- GET /git/changelog_summary?size=10&page=3                          2     0(0.00%)    1285     970    1601  |     970    0.00
- GET /git/changeset/d299e9e550c1bf8640907fdba1f03cc585ee71df        2     0(0.00%)    1041     936    1146  |     940    0.00
- GET /git/changeset/d8b396e17ecfe28b39b5f4470f791c434cce40ec        1     0(0.00%)     830     830     830  |     830    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/           2     0(0.00%)   44548   44276   44821  |   44000    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/builtin       1     0(0.00%)   11120   11120   11120  |   11000    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/builtin/read-tree.c       1     0(0.00%)     863     863     863  |     860    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/builtin/rerere.c       1     0(0.00%)    1076    1076    1076  |    1100    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/builtin/upload-archive.c       1     0(0.00%)    1256    1256    1256  |    1300    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/compat       1     0(0.00%)    6305    6305    6305  |    6300    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/compat/fopen.c       1     0(0.00%)     697     697     697  |     700    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/ctype.c       1     0(0.00%)     859     859     859  |     860    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git       4     0(0.00%)     950     745    1135  |     910    0.10
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/.gitignore       3     0(0.00%)     619     606     643  |     610    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/Makefile       1     0(0.00%)     895     895     895  |     900    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/po       2     0(0.00%)    3015    2986    3044  |    3000    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/po/.gitignore       1     0(0.00%)    1126    1126    1126  |    1100    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/po/hu.po       1     0(0.00%)    1123    1123    1123  |    1100    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/po/sv.po       1     0(0.00%)     626     626     626  |     630    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/mailmap.c       1     0(0.00%)    1186    1186    1186  |    1200    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/notes-merge.c       1     0(0.00%)     766     766     766  |     770    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/perl       1     0(0.00%)    1076    1076    1076  |    1100    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/perl/Git       1     0(0.00%)    1085    1085    1085  |    1100    0.10
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/progress.h       1     0(0.00%)     794     794     794  |     790    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/sigchain.c       1     0(0.00%)     764     764     764  |     760    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/templates       1     0(0.00%)    4525    4525    4525  |    4500    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/templates/hooks--prepare-commit-msg.sample       1     0(0.00%)     900     900     900  |     900    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/test-hashmap.c       1     0(0.00%)     540     540     540  |     540    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/test-line-buffer.c       1     0(0.00%)     786     786     786  |     790    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/vcs-svn       1     0(0.00%)    3224    3224    3224  |    3200    0.00
- GET /git/files/tip/                                                3     0(0.00%)   44722   42670   47681  |   44000    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/builtin/apply.c       1     0(0.00%)     655     655     655  |     660    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/builtin/fmt-merge-msg.c       1     0(0.00%)     531     531     531  |     530    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/builtin/index-pack.c       1     0(0.00%)     655     655     655  |     660    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/combine-diff.c       1     0(0.00%)     352     352     352  |     350    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/git-compat-util.h       1     0(0.00%)     552     552     552  |     550    0.10
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/git-web--browse.sh       1     0(0.00%)     453     453     453  |     450    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/.gitignore       3     0(0.00%)     543     351     875  |     400    0.20
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/Makefile       1     0(0.00%)     562     562     562  |     560    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/po/it.po       1     0(0.00%)     319     319     319  |     320    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/line-range.c       1     0(0.00%)     324     324     324  |     320    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/pack-bitmap.h       1     0(0.00%)     410     410     410  |     410    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/perl/Git/I18N.pm       2     0(0.00%)     551     471     632  |     470    0.20
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/tag.c        1     0(0.00%)     616     616     616  |     620    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/templates/branches--       1     0(0.00%)     490     490     490  |     490    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/templates/this--description       1     0(0.00%)     346     346     346  |     350    0.00
---------------------------------------------------------------------------------------------------------------------------------------------
- Total                                                            500     0(0.00%)                                       1.90
-
-
-RC Branch @5886 (with VCS2 optimizations)
-+++++++++++++++++++++++++++++++++++++++++
-
- Name                                                          # reqs      # fails     Avg     Min     Max  |  Median   req/s
---------------------------------------------------------------------------------------------------------------------------------------------
- GET /                                                              9     0(0.00%)     502     231     719  |     520    0.00
- POST /_admin/login?came_from=/                                     2     0(0.00%)     702     696     709  |     700    0.00
- GET /cpython                                                       2     0(0.00%)     766     732     800  |     730    0.00
- GET /cpython/annotate/{revision}/{path} [file_annotate]           12     0(0.00%)    1125     305    5130  |     710    0.00
- GET /cpython/changelog/?page={page}                              153     0(0.00%)    1203     378    2391  |    1300    0.60
- GET /cpython/changelog_summary?page={page}                        25     0(0.00%)     685     249    1256  |     640    0.00
- GET /cpython/changeset/{changeset}                               158     0(0.00%)     726     254    1492  |     730    0.30
- GET /cpython/file/{revision}/{path} [dir]                         12     0(0.00%)     885     311    1660  |     780    0.00
- GET /cpython/file/{revision}/{path} [file]                        14     0(0.00%)     740     257    1228  |     700    0.00
- GET /cpython/raw/{revision}/{path} [file_raw]                     18     0(0.00%)     462     196     908  |     390    0.00
- GET /git                                                           2     0(0.00%)    2293     545    4041  |     550    0.00
- GET /git/annotate/{revision}/{path} [file_annotate]                8     0(0.00%)    1345     811    2153  |    1100    0.00
- GET /git/changelog/?page={page}                                   24     0(0.00%)    1400     672    1894  |    1400    0.00
- GET /git/changelog_summary?page={page}                            18     0(0.00%)     986     462    1475  |     970    0.40
- GET /git/changeset/{changeset}                                    10     0(0.00%)     811     320    1258  |     760    0.20
- GET /git/file/{revision}/{path} [dir]                             12     0(0.00%)   12083     567   43469  |    2500    0.00
- GET /git/file/{revision}/{path} [file]                            12     0(0.00%)     761     430    1161  |     680    0.00
- GET /git/raw/{revision}/{path} [file_raw]                          9     0(0.00%)     504     208     912  |     400    0.00
---------------------------------------------------------------------------------------------------------------------------------------------
- Total                                                            500     0(0.00%)                                       1.50
-
-
- Name                                                          # reqs      # fails     Avg     Min     Max  |  Median   req/s
---------------------------------------------------------------------------------------------------------------------------------------------
- GET /                                                              9     0(0.00%)     428     133     797  |     390    0.00
- POST /_admin/login?came_from=/                                     2     0(0.00%)     640     572     709  |     570    0.00
- GET /cpython                                                       2     0(0.00%)    1005     640    1371  |     640    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/.hgtags       2     0(0.00%)    1305     899    1712  |     900    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Grammar/Grammar       2     0(0.00%)     791     491    1092  |     490    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Makefile.pre.in       1     0(0.00%)    5160    5160    5160  |    5200    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Misc/RPM/README       1     0(0.00%)     410     410     410  |     410    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Misc/valgrind-python.supp       1     0(0.00%)    1102    1102    1102  |    1100    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Programs/README       1     0(0.00%)    1238    1238    1238  |    1200    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Programs/_freeze_importlib.c       1     0(0.00%)     619     619     619  |     620    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Programs/_testembed.c       2     0(0.00%)     941     705    1177  |     710    0.00
- GET /cpython/annotate/74236c8bf064188516b32bf95016971227ec72a9/Programs/python.c       1     0(0.00%)     404     404     404  |     400    0.00
- GET /cpython/changelog?page=1                                      6     0(0.00%)    1446     749    2104  |    1400    0.00
- GET /cpython/changelog?page=10                                     3     0(0.00%)    1059     785    1418  |     970    0.00
- GET /cpython/changelog?page=11                                     5     0(0.00%)    1020     777    1312  |    1000    0.00
- GET /cpython/changelog?page=12                                     7     0(0.00%)    1047     494    1485  |    1100    0.00
- GET /cpython/changelog?page=13                                     6     0(0.00%)    1119     587    1526  |    1200    0.00
- GET /cpython/changelog?page=14                                     4     0(0.00%)     922     545    1399  |     790    0.00
- GET /cpython/changelog?page=15                                     3     0(0.00%)     813     415    1384  |     640    0.00
- GET /cpython/changelog?page=16                                     2     0(0.00%)    1341    1129    1553  |    1100    0.00
- GET /cpython/changelog?page=17                                     2     0(0.00%)    1322    1313    1332  |    1300    0.00
- GET /cpython/changelog?page=18                                     2     0(0.00%)    1032     698    1366  |     700    0.00
- GET /cpython/changelog?page=19                                     4     0(0.00%)     990     437    1491  |     840    0.00
- GET /cpython/changelog?page=2                                      4     0(0.00%)     953     626    1280  |     830    0.00
- GET /cpython/changelog?page=20                                     5     0(0.00%)    1124     387    1392  |    1300    0.00
- GET /cpython/changelog?page=21                                     3     0(0.00%)     908     388    1200  |    1100    0.00
- GET /cpython/changelog?page=22                                     3     0(0.00%)    1668    1415    1797  |    1800    0.00
- GET /cpython/changelog?page=23                                     3     0(0.00%)    1314     720    1748  |    1500    0.00
- GET /cpython/changelog?page=24                                     2     0(0.00%)    1376    1278    1474  |    1300    0.00
- GET /cpython/changelog?page=25                                     2     0(0.00%)    1424    1342    1507  |    1300    0.00
- GET /cpython/changelog?page=26                                     9     0(0.00%)    1429     970    1904  |    1600    0.10
- GET /cpython/changelog?page=27                                    10     0(0.00%)    1325     724    1674  |    1300    0.20
- GET /cpython/changelog?page=28                                     5     0(0.00%)    1438     845    1815  |    1600    0.00
- GET /cpython/changelog?page=29                                     3     0(0.00%)    1332     912    1644  |    1400    0.00
- GET /cpython/changelog?page=3                                      4     0(0.00%)    1553    1205    1760  |    1600    0.00
- GET /cpython/changelog?page=30                                     1     0(0.00%)    1144    1144    1144  |    1100    0.00
- GET /cpython/changelog?page=31                                     1     0(0.00%)    1047    1047    1047  |    1000    0.00
- GET /cpython/changelog?page=32                                     1     0(0.00%)    1038    1038    1038  |    1000    0.00
- GET /cpython/changelog?page=33                                     3     0(0.00%)     917     395    1245  |    1100    0.00
- GET /cpython/changelog?page=34                                     4     0(0.00%)    1185     971    1532  |    1100    0.00
- GET /cpython/changelog?page=35                                     2     0(0.00%)     570     463     677  |     460    0.00
- GET /cpython/changelog?page=36                                     1     0(0.00%)     941     941     941  |     940    0.00
- GET /cpython/changelog?page=37                                     3     0(0.00%)    1669    1371    1842  |    1800    0.00
- GET /cpython/changelog?page=38                                     3     0(0.00%)    1114     860    1573  |     910    0.00
- GET /cpython/changelog?page=39                                     1     0(0.00%)    1506    1506    1506  |    1500    0.00
- GET /cpython/changelog?page=4                                      5     0(0.00%)    1426     676    2673  |    1100    0.00
- GET /cpython/changelog?page=40                                     1     0(0.00%)    1771    1771    1771  |    1800    0.00
- GET /cpython/changelog?page=41                                     1     0(0.00%)    1732    1732    1732  |    1700    0.00
- GET /cpython/changelog?page=42                                     1     0(0.00%)    1546    1546    1546  |    1500    0.00
- GET /cpython/changelog?page=43                                     2     0(0.00%)    1539    1377    1701  |    1400    0.00
- GET /cpython/changelog?page=44                                     2     0(0.00%)    1264     945    1583  |     950    0.00
- GET /cpython/changelog?page=45                                     1     0(0.00%)     595     595     595  |     600    0.10
- GET /cpython/changelog?page=46                                     1     0(0.00%)    1099    1099    1099  |    1100    0.10
- GET /cpython/changelog?page=47                                     1     0(0.00%)    1672    1672    1672  |    1700    0.10
- GET /cpython/changelog?page=48                                     1     0(0.00%)    1698    1698    1698  |    1700    0.00
- GET /cpython/changelog?page=5                                      5     0(0.00%)    1051     432    1749  |     920    0.00
- GET /cpython/changelog?page=6                                      4     0(0.00%)    1292     568    1980  |    1100    0.00
- GET /cpython/changelog?page=7                                      4     0(0.00%)    1513    1136    1869  |    1300    0.00
- GET /cpython/changelog?page=8                                      3     0(0.00%)    1521    1113    1811  |    1600    0.00
- GET /cpython/changelog?page=9                                      3     0(0.00%)    1378     872    1798  |    1500    0.00
- GET /cpython/changelog_summary?size=10&page=0                      1     0(0.00%)     281     281     281  |     280    0.00
- GET /cpython/changelog_summary?size=10&page=10                     1     0(0.00%)     291     291     291  |     290    0.00
- GET /cpython/changelog_summary?size=10&page=11                     2     0(0.00%)     429     395     463  |     400    0.00
- GET /cpython/changelog_summary?size=10&page=12                     1     0(0.00%)     499     499     499  |     500    0.00
- GET /cpython/changelog_summary?size=10&page=2                      3     0(0.00%)     935     899     985  |     920    0.00
- GET /cpython/changelog_summary?size=10&page=3                      3     0(0.00%)     392     250     652  |     270    0.00
- GET /cpython/changelog_summary?size=10&page=4                      1     0(0.00%)     928     928     928  |     930    0.00
- GET /cpython/changelog_summary?size=10&page=5                      4     0(0.00%)     904     350    1280  |     820    0.00
- GET /cpython/changelog_summary?size=10&page=6                      4     0(0.00%)     570     254    1039  |     440    0.00
- GET /cpython/changelog_summary?size=10&page=7                      1     0(0.00%)    1208    1208    1208  |    1200    0.00
- GET /cpython/changelog_summary?size=10&page=8                      2     0(0.00%)     426     256     596  |     260    0.00
- GET /cpython/changelog_summary?size=10&page=9                      2     0(0.00%)     721     645     798  |     650    0.00
- GET /cpython/changeset/0039154be0c0298e68c80cc721e51b50ce238ec8       1     0(0.00%)     977     977     977  |     980    0.00
- GET /cpython/changeset/0045eec1e247c9b0855d5dd0ffa724068c43b8f7       2     0(0.00%)     830     648    1012  |     650    0.00
- GET /cpython/changeset/014060738f7f89044fbe3a231b491daa69f7e366       1     0(0.00%)    1041    1041    1041  |    1000    0.00
- GET /cpython/changeset/01ec8bb7187f9d6849ce566062e47afe48fabef9       1     0(0.00%)     432     432     432  |     430    0.00
- GET /cpython/changeset/02b25ec13c94e87e6e8ac2876455d776377a945a       1     0(0.00%)     516     516     516  |     520    0.00
- GET /cpython/changeset/057a8bd043ea759ad7fbd25a90a942f8078efff4       2     0(0.00%)     921     455    1388  |     460    0.00
- GET /cpython/changeset/05e8f92b58ff41bb4d710d80a0793728900674eb       1     0(0.00%)     820     820     820  |     820    0.00
- GET /cpython/changeset/0788d0d6bf85c32ea72a378a9aa9efa05430d089       1     0(0.00%)     307     307     307  |     310    0.00
- GET /cpython/changeset/0b477934e0a1a1f032010ee4f21261958bd65c14       1     0(0.00%)     631     631     631  |     630    0.00
- GET /cpython/changeset/0b79c702abda873c6f45a720f028bffeb87bb8d7       1     0(0.00%)     623     623     623  |     620    0.00
- GET /cpython/changeset/0c2792a8f9db14ed6d5c67d557af3ed64aa83ba0       3     0(0.00%)     692     291    1410  |     380    0.00
- GET /cpython/changeset/0c57aba6b1a320127340076300e23f90c0e21d44       2     0(0.00%)    1010     618    1403  |     620    0.00
- GET /cpython/changeset/0fef0afb9d198b747194d259b8d3dad2b8f4dfc4       1     0(0.00%)    1241    1241    1241  |    1200    0.00
- GET /cpython/changeset/1c48171fc8da0225f22f498b699ecb7f3f6db41d       2     0(0.00%)     991     655    1327  |     660    0.00
- GET /cpython/changeset/1c7567ec6292238ec80c1bca7b81d3088972cbfb       1     0(0.00%)     631     631     631  |     630    0.00
- GET /cpython/changeset/1db5cde4958f5a80d8236a6244cf99fe8b4987e5       1     0(0.00%)     776     776     776  |     780    0.00
- GET /cpython/changeset/221a1f9155e2a8b4d12015261b83a2ce3a0c62a2       2     0(0.00%)     774     486    1062  |     490    0.00
- GET /cpython/changeset/263701e0b77e3160bc6a835087f838bd6b24092a       1     0(0.00%)    1132    1132    1132  |    1100    0.00
- GET /cpython/changeset/26afcb8a87b95e9bba8348528d3876c4851b1184       1     0(0.00%)     610     610     610  |     610    0.00
- GET /cpython/changeset/275d02865d11b517bb0c132bf4c345b858a3882c       1     0(0.00%)    1101    1101    1101  |    1100    0.00
- GET /cpython/changeset/275da9f9d7d7c4049409d26b02786326a23e870d       1     0(0.00%)     440     440     440  |     440    0.00
- GET /cpython/changeset/294b598afbb6878a65cf36ea2ca7065b4684a7e8       3     0(0.00%)     698     380     869  |     850    0.00
- GET /cpython/changeset/2ae5709692ef6afed4c3602a75f3a7bc578303cc       1     0(0.00%)     587     587     587  |     590    0.00
- GET /cpython/changeset/2e0a98178c07e4e5989c6e0f8270d98f4fd5579a       1     0(0.00%)    1021    1021    1021  |    1000    0.00
- GET /cpython/changeset/2f2c1816d0c7a2897bc5d36ea5bdd415e730fdc1       2     0(0.00%)    1068     773    1364  |     770    0.00
- GET /cpython/changeset/3435c5865cfcb4d31a48c13097176f6abe4a4289       1     0(0.00%)    1243    1243    1243  |    1200    0.00
- GET /cpython/changeset/345ce3d2986a5976016d57c97f67c253cdc2f616       1     0(0.00%)     815     815     815  |     820    0.00
- GET /cpython/changeset/38688f0a0e047e6702048f59247cd4a85e8e350e       1     0(0.00%)     811     811     811  |     810    0.00
- GET /cpython/changeset/3b6b905ae229d2fa06268615c696a3a64aded264       1     0(0.00%)     824     824     824  |     820    0.00
- GET /cpython/changeset/404cf4c071c8f84e68857afaa7fa4cf6f55804e1       1     0(0.00%)     573     573     573  |     570    0.00
- GET /cpython/changeset/410439e94a40316b56564ba4fd47f4d28c34f783       1     0(0.00%)     670     670     670  |     670    0.00
- GET /cpython/changeset/438da6ae38faa5d3b0dc998c72ac10aeb3c7f268       1     0(0.00%)    1053    1053    1053  |    1100    0.00
- GET /cpython/changeset/45dcdd8f32118a433e5e3dcc7b356006cd2a486f       1     0(0.00%)    1072    1072    1072  |    1100    0.00
- GET /cpython/changeset/49085b7460291e4ce7e2113d02e28ea41eec752d       2     0(0.00%)     771     495    1047  |     500    0.00
- GET /cpython/changeset/49cdb04bfcc6f1245aee9254229d8e01d3ef4293       1     0(0.00%)     907     907     907  |     910    0.00
- GET /cpython/changeset/4be39be5230c07ba57986df7e13690777905ad1b       2     0(0.00%)    1033     734    1333  |     730    0.00
- GET /cpython/changeset/4d3f960c26f5eadb2346081aee8e87b07b2e30c5       1     0(0.00%)     855     855     855  |     860    0.00
- GET /cpython/changeset/4ef517041573969a1f58d3ed512f3395673c1587       1     0(0.00%)     816     816     816  |     820    0.00
- GET /cpython/changeset/4f359c631bb0f69c536cba1078421cf01c35b3ee       2     0(0.00%)     617     311     923  |     310    0.00
- GET /cpython/changeset/50527a1b769c2e4323511cbdcbdf4e66a779ac99       1     0(0.00%)     785     785     785  |     790    0.00
- GET /cpython/changeset/50c995bdc00a3fb6941d6c946e4e16bc26fe93be       1     0(0.00%)     496     496     496  |     500    0.00
- GET /cpython/changeset/5496bf8972b6f1f2b3d39baf6e6591363c4b79a7       1     0(0.00%)     616     616     616  |     620    0.00
- GET /cpython/changeset/57740d19f5c2c063231d1d2898b940fd16f13355       1     0(0.00%)     408     408     408  |     410    0.00
- GET /cpython/changeset/58e0d2c3ead8ff3dfe0cb5a6f79c0f69dde281b7       1     0(0.00%)     977     977     977  |     980    0.00
- GET /cpython/changeset/5a157e3b3c47ed38e1f1f4c466f68c3c35585667       1     0(0.00%)     855     855     855  |     860    0.00
- GET /cpython/changeset/5a58f6e793ccf17393c725e01b741c0fec5450f2       1     0(0.00%)     582     582     582  |     580    0.00
- GET /cpython/changeset/5ac811cbec879f87ca1c6f91f2bd9f3ead8f3a85       1     0(0.00%)     903     903     903  |     900    0.00
- GET /cpython/changeset/6219aa966a5fb7572502646377cc8d67c45697fb       1     0(0.00%)    1369    1369    1369  |    1400    0.00
- GET /cpython/changeset/6298895a52de36edaf182316a1081ccdfebf134e       1     0(0.00%)    1125    1125    1125  |    1100    0.00
- GET /cpython/changeset/65018d952340acda44c20baee75184a696dd1887       1     0(0.00%)     638     638     638  |     640    0.00
- GET /cpython/changeset/66c7f30fe8c7943ff09500d9ccb4836a15dedec1       1     0(0.00%)     447     447     447  |     450    0.00
- GET /cpython/changeset/69783040dd543d748f7197fdf7d9e147ba9cbc71       1     0(0.00%)     789     789     789  |     790    0.00
- GET /cpython/changeset/6a71d3c796532cab3f2661e134bbf28ae9902435       2     0(0.00%)     729     276    1183  |     280    0.00
- GET /cpython/changeset/6cbb97f039bdb1b63469c76e759d149d4e6841de       1     0(0.00%)    1097    1097    1097  |    1100    0.00
- GET /cpython/changeset/6d41f139709b7c77293f9d71f2316b790ebecc21       1     0(0.00%)    1238    1238    1238  |    1200    0.00
- GET /cpython/changeset/6e67a0394957f1756269defbaab505b45524b853       1     0(0.00%)    1467    1467    1467  |    1500    0.00
- GET /cpython/changeset/734d5ab0ce6ac6333a35e98a014f49ea3b0205cb       1     0(0.00%)     687     687     687  |     690    0.00
- GET /cpython/changeset/7640af73c19d5ebe409ad8aa41aa2eb5b8f6dac1       2     0(0.00%)     363     275     451  |     280    0.00
- GET /cpython/changeset/766570a5d6070488cbf5acf967c500088d1f4c17       1     0(0.00%)     748     748     748  |     750    0.00
- GET /cpython/changeset/7749d30d9caa81113f5a84578e55e5336251eb66       1     0(0.00%)     926     926     926  |     930    0.00
- GET /cpython/changeset/77fbbb5a73064ee17425b5fd8e6d68cf91ca33ab       1     0(0.00%)    1261    1261    1261  |    1300    0.00
- GET /cpython/changeset/7bc53cf8b2dfb0a9fe4dfb1bb08e26d8dce04eba       1     0(0.00%)    1096    1096    1096  |    1100    0.00
- GET /cpython/changeset/7c19f1f792c6c8d5a7e4c3e8d424318c3fe0663b       1     0(0.00%)     293     293     293  |     290    0.00
- GET /cpython/changeset/7ed237478fcc3695d2b95b861efcff0a43a023e5       3     0(0.00%)     537     256     959  |     400    0.00
- GET /cpython/changeset/7f8843ec34ee4049493b58882cb7165d5e268f9b       1     0(0.00%)    1213    1213    1213  |    1200    0.00
- GET /cpython/changeset/8039a20b18cc17fdbbc91758746e6344948022e4       1     0(0.00%)    1030    1030    1030  |    1000    0.00
- GET /cpython/changeset/8106f91fccd66f1306426e190e684e395b9d3132       1     0(0.00%)     628     628     628  |     630    0.00
- GET /cpython/changeset/823f5507bd864cdb1899dbc05a42355bf7188728       1     0(0.00%)    1031    1031    1031  |    1000    0.00
- GET /cpython/changeset/855ff9182a0778ba1e20af6fc043d27591d66d80       2     0(0.00%)     877     864     891  |     860    0.10
- GET /cpython/changeset/87f940e85cb0e48208ca25a87b5b58cb6cfb886e       1     0(0.00%)     304     304     304  |     300    0.00
- GET /cpython/changeset/88a532a31eb383dd19a43d0a3c4c9841f84fd88f       2     0(0.00%)     834     664    1004  |     660    0.00
- GET /cpython/changeset/897c9e6ddb1ac1d467d2bf700aecbc585c6e33ac       1     0(0.00%)     968     968     968  |     970    0.00
- GET /cpython/changeset/8b8b79e1f8626a69c3f2abccb2147e148d52173e       1     0(0.00%)     352     352     352  |     350    0.00
- GET /cpython/changeset/92d691c3ca009b890bd844708ef60335424295f6       1     0(0.00%)    1115    1115    1115  |    1100    0.00
- GET /cpython/changeset/944fc499ccd30a5a4d868373b69d8585bd07cdf7       1     0(0.00%)     947     947     947  |     950    0.00
- GET /cpython/changeset/958e8bebda6d3ec7fee21e0ede5a871b1c818948       1     0(0.00%)     545     545     545  |     550    0.00
- GET /cpython/changeset/962c1fefc34af9db3110c9c6538e5cdb39c170de       1     0(0.00%)     694     694     694  |     690    0.00
- GET /cpython/changeset/97ed0b51bbc078cd5a836932422a7517af6fa8aa       1     0(0.00%)     421     421     421  |     420    0.00
- GET /cpython/changeset/9b450b19aa118c4888b6acc6ba5e8f0fb00aaa87       1     0(0.00%)     322     322     322  |     320    0.00
- GET /cpython/changeset/9e3c367b45a189e941eb3a772964a54b5b7574d5       1     0(0.00%)    1069    1069    1069  |    1100    0.00
- GET /cpython/changeset/a0ae1ac69925b3ae866c7e089e95400aa3681a42       1     0(0.00%)     277     277     277  |     280    0.00
- GET /cpython/changeset/a62368778d6cd0c6473f149f8d850dcce7f31031       1     0(0.00%)     732     732     732  |     730    0.00
- GET /cpython/changeset/a74c48aa43eb5109351b49d8b1e420612389a2e8       1     0(0.00%)    1344    1344    1344  |    1300    0.00
- GET /cpython/changeset/a77dc87a34fffe2b6899fa6b5a8f5b226e9bf952       1     0(0.00%)     776     776     776  |     780    0.00
- GET /cpython/changeset/a8db78d7b6574b425d6b1a38f55068761f5da2e7       1     0(0.00%)    1001    1001    1001  |    1000    0.00
- GET /cpython/changeset/a9637b29954d952ffcdde6bd76cd2202282427a0       1     0(0.00%)     526     526     526  |     530    0.00
- GET /cpython/changeset/aa059a8fb55a957b84bbe471bab74514adf23ee4       1     0(0.00%)     513     513     513  |     510    0.00
- GET /cpython/changeset/ad7ac2a469e1e9858825a646ffcbce68aae8ed40       2     0(0.00%)     432     254     611  |     250    0.00
- GET /cpython/changeset/afd64e6606288447e75ad8031cf72112f47b5dba       1     0(0.00%)    1036    1036    1036  |    1000    0.00
- GET /cpython/changeset/b08921c7d1ecfa43aa47f3453a87f705e9b92af8       1     0(0.00%)     989     989     989  |     990    0.00
- GET /cpython/changeset/b1c82ef96862101642deb702e046763f09678c3f       1     0(0.00%)     502     502     502  |     500    0.00
- GET /cpython/changeset/b3aa30f474c4c5dd8f12c92c1156d7aa5393d72b       1     0(0.00%)     545     545     545  |     550    0.00
- GET /cpython/changeset/b5114747d3edb248c91f0da90d10f0bcf9514630       1     0(0.00%)     771     771     771  |     770    0.00
- GET /cpython/changeset/b94da2b69d13ecc9f8c13ad74c411409edd56ca5       2     0(0.00%)     547     489     606  |     490    0.00
- GET /cpython/changeset/b957f475e41eaae8678c092b326b42579a5d2de6       1     0(0.00%)     292     292     292  |     290    0.00
- GET /cpython/changeset/bc991d4f9ce70bdcc3da7cd0b1fe916a17a0a805       2     0(0.00%)     626     303     950  |     300    0.00
- GET /cpython/changeset/c173a34f20c02bb5a188fa80ccdcf1b5fc7e551e       1     0(0.00%)    1085    1085    1085  |    1100    0.00
- GET /cpython/changeset/c1edc4e43eb103254c5d96f1708542623fe08f17       1     0(0.00%)     291     291     291  |     290    0.00
- GET /cpython/changeset/c238d2899d47c21cf34f6927146dce8a0126a6a0       1     0(0.00%)     426     426     426  |     430    0.00
- GET /cpython/changeset/c48980af7df207e8c606e00c054eadb513f59d37       2     0(0.00%)     880     494    1267  |     490    0.00
- GET /cpython/changeset/c4f053f1b47f9a63eb8bfb13bac2a5674e2ef999       1     0(0.00%)     604     604     604  |     600    0.00
- GET /cpython/changeset/c755a3b58fa6d98b0c68e309d3299cdc52c34ba9       1     0(0.00%)     632     632     632  |     630    0.00
- GET /cpython/changeset/c8ce5bca0fcda4307f7ac5d69103ce128a562705       1     0(0.00%)    1100    1100    1100  |    1100    0.00
- GET /cpython/changeset/ca4a22256bf88452349c2ff54b90a4bd983cb72d       2     0(0.00%)     485     447     524  |     450    0.00
- GET /cpython/changeset/d4b035c9fb7df8750d86f27702b41ee190ba4cb3       1     0(0.00%)     898     898     898  |     900    0.00
- GET /cpython/changeset/d775fa9a97678fb93eef1396bf67832f872abbfd       1     0(0.00%)     815     815     815  |     820    0.00
- GET /cpython/changeset/d85fcf23549e002626618196d930d3c807d2b20e       1     0(0.00%)     419     419     419  |     420    0.00
- GET /cpython/changeset/d9607a71456e0ff635251fcb9ac09369cb0a4b89       1     0(0.00%)     444     444     444  |     440    0.00
- GET /cpython/changeset/d99014320220951707f79d114ae33f8c5a372a87       1     0(0.00%)    1263    1263    1263  |    1300    0.00
- GET /cpython/changeset/d9da4b77624b522ce367a37d737acd208b3f793f       1     0(0.00%)    1375    1375    1375  |    1400    0.00
- GET /cpython/changeset/db600c927b2b87537c5e71ce39d825675cfb5e63       1     0(0.00%)     690     690     690  |     690    0.00
- GET /cpython/changeset/dce9dbc8e8924582d3ddb3b18f40d712c30631ea       1     0(0.00%)     301     301     301  |     300    0.00
- GET /cpython/changeset/e0561df131aaf6580523fbdb172239922e0026e9       1     0(0.00%)     571     571     571  |     570    0.00
- GET /cpython/changeset/e0f681f4ade3af52915d5f32daac97ada580d71a       5     0(0.00%)     546     388     714  |     540    0.00
- GET /cpython/changeset/e405bcbf761cc79afddc60045d7e94af6d2e144f       1     0(0.00%)     753     753     753  |     750    0.00
- GET /cpython/changeset/e6bb59b6b85c14f25582961abcdd6a2c7e16f487       1     0(0.00%)    1046    1046    1046  |    1000    0.00
- GET /cpython/changeset/e6be82fbc02519c1b61399bfd204d61489163eeb       1     0(0.00%)    1200    1200    1200  |    1200    0.00
- GET /cpython/changeset/e750d2b44c1d4692545661fd325960b17fbe6fe6       1     0(0.00%)     636     636     636  |     640    0.00
- GET /cpython/changeset/eafe4007c999f277bc84038af21d65fb6ea1aec8       1     0(0.00%)    1025    1025    1025  |    1000    0.00
- GET /cpython/changeset/ebd6f7f7859f05efb66ee99fd22516d61b720afe       1     0(0.00%)     390     390     390  |     390    0.00
- GET /cpython/changeset/ec2efc094d6245dbd0ce2a2fca394a15ee627888       1     0(0.00%)     967     967     967  |     970    0.00
- GET /cpython/changeset/eee636e3edbe117a552d637afc0bcaf88f5c42a9       1     0(0.00%)     660     660     660  |     660    0.00
- GET /cpython/changeset/efb0a3eb4e06e649d61dc9f96d3a8962974cf04f       1     0(0.00%)     878     878     878  |     880    0.00
- GET /cpython/changeset/f02a563ad1bf5150dafe25080b249a955aa253f1       1     0(0.00%)    1233    1233    1233  |    1200    0.10
- GET /cpython/changeset/f0a5be139717b166a72db1e713d97006b191c746       1     0(0.00%)     254     254     254  |     250    0.00
- GET /cpython/changeset/f0ab6f9f06036dfacff09f22f86464840b50eb0a       3     0(0.00%)     804     538     987  |     890    0.00
- GET /cpython/changeset/f5df571bfe1d66406c0171cd59cf0da9708d345c       1     0(0.00%)     387     387     387  |     390    0.00
- GET /cpython/changeset/fc7f28b11d208f0e4716cbb0f7068901e7d65046       1     0(0.00%)     890     890     890  |     890    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/       2     0(0.00%)     829     558    1101  |     560    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Grammar       3     0(0.00%)     882     576    1093  |     980    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Grammar/Grammar       2     0(0.00%)     590     414     766  |     410    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Makefile.pre.in       1     0(0.00%)     764     764     764  |     760    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc       3     0(0.00%)    1047     780    1284  |    1100    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/ACKS       1     0(0.00%)    1039    1039    1039  |    1000    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/RPM       1     0(0.00%)     210     210     210  |     210    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/coverity_model.c       1     0(0.00%)     446     446     446  |     450    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/python-config.in       1     0(0.00%)     776     776     776  |     780    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/python-wing4.wpr       1     0(0.00%)     769     769     769  |     770    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/python-wing5.wpr       1     0(0.00%)     883     883     883  |     880    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Misc/python.pc.in       1     0(0.00%)     382     382     382  |     380    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/PC       1     0(0.00%)    1841    1841    1841  |    1800    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Programs       1     0(0.00%)     751     751     751  |     750    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Programs/README       2     0(0.00%)     698     424     972  |     420    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/Programs/python.c       1     0(0.00%)     713     713     713  |     710    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/README       1     0(0.00%)     253     253     253  |     250    0.00
- GET /cpython/files/74236c8bf064188516b32bf95016971227ec72a9/install-sh       1     0(0.00%)     474     474     474  |     470    0.00
- GET /cpython/files/tip/                                            1     0(0.00%)    1276    1276    1276  |    1300    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/.hgtouch       1     0(0.00%)     582     582     582  |     580    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Grammar/Grammar       5     0(0.00%)     486     209     784  |     480    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Misc/NEWS       1     0(0.00%)     518     518     518  |     520    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Misc/coverity_model.c       1     0(0.00%)     921     921     921  |     920    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Misc/python-wing4.wpr       1     0(0.00%)     413     413     413  |     410    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Programs/README       1     0(0.00%)     427     427     427  |     430    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Programs/_freeze_importlib.c       5     0(0.00%)     480     267     856  |     490    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/Programs/_testembed.c       1     0(0.00%)     531     531     531  |     530    0.00
- GET /cpython/raw/74236c8bf064188516b32bf95016971227ec72a9/config.sub       2     0(0.00%)     630     496     765  |     500    0.00
- GET /git                                                           2     0(0.00%)    2382    1181    3584  |    1200    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/git-am.sh       1     0(0.00%)    2625    2625    2625  |    2600    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/.gitignore       2     0(0.00%)    1222     986    1458  |     990    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/Makefile       1     0(0.00%)    1497    1497    1497  |    1500    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/gitk       1     0(0.00%)    1263    1263    1263  |    1300    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/po/de.po       1     0(0.00%)    1625    1625    1625  |    1600    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/templates/info--exclude       1     0(0.00%)    1139    1139    1139  |    1100    0.00
- GET /git/annotate/6c4ab27f2378ce67940b4496365043119d7ffff2/wildmatch.c       1     0(0.00%)    1340    1340    1340  |    1300    0.00
- GET /git/changelog?page=1                                          1     0(0.00%)    1894    1894    1894  |    1900    0.00
- GET /git/changelog?page=10                                         1     0(0.00%)    1618    1618    1618  |    1600    0.00
- GET /git/changelog?page=11                                         1     0(0.00%)     910     910     910  |     910    0.00
- GET /git/changelog?page=12                                         1     0(0.00%)    1512    1512    1512  |    1500    0.00
- GET /git/changelog?page=13                                         1     0(0.00%)    1659    1659    1659  |    1700    0.00
- GET /git/changelog?page=14                                         1     0(0.00%)    1599    1599    1599  |    1600    0.00
- GET /git/changelog?page=15                                         1     0(0.00%)    1616    1616    1616  |    1600    0.00
- GET /git/changelog?page=16                                         1     0(0.00%)    1647    1647    1647  |    1600    0.00
- GET /git/changelog?page=17                                         1     0(0.00%)    1692    1692    1692  |    1700    0.00
- GET /git/changelog?page=18                                         1     0(0.00%)    1636    1636    1636  |    1600    0.00
- GET /git/changelog?page=2                                          1     0(0.00%)    1820    1820    1820  |    1800    0.00
- GET /git/changelog?page=3                                          1     0(0.00%)    1702    1702    1702  |    1700    0.00
- GET /git/changelog?page=4                                          1     0(0.00%)    1395    1395    1395  |    1400    0.00
- GET /git/changelog?page=5                                          2     0(0.00%)    1699    1530    1868  |    1500    0.00
- GET /git/changelog?page=6                                          3     0(0.00%)    1573    1361    1732  |    1600    0.00
- GET /git/changelog?page=7                                          3     0(0.00%)    1372    1104    1718  |    1300    0.00
- GET /git/changelog?page=8                                          2     0(0.00%)    1318    1075    1561  |    1100    0.00
- GET /git/changelog?page=9                                          1     0(0.00%)    1522    1522    1522  |    1500    0.00
- GET /git/changelog_summary?size=10&page=10                         2     0(0.00%)    1350    1325    1376  |    1300    0.10
- GET /git/changelog_summary?size=10&page=11                         1     0(0.00%)    1381    1381    1381  |    1400    0.00
- GET /git/changelog_summary?size=10&page=2                          3     0(0.00%)     852     722     924  |     910    0.00
- GET /git/changelog_summary?size=10&page=3                          3     0(0.00%)    1054     728    1462  |     970    0.00
- GET /git/changelog_summary?size=10&page=4                          2     0(0.00%)    1362    1356    1368  |    1400    0.00
- GET /git/changelog_summary?size=10&page=5                          2     0(0.00%)    1119     923    1315  |     920    0.00
- GET /git/changelog_summary?size=10&page=6                          1     0(0.00%)     524     524     524  |     520    0.00
- GET /git/changelog_summary?size=10&page=7                          2     0(0.00%)     800     549    1051  |     550    0.10
- GET /git/changelog_summary?size=10&page=8                          2     0(0.00%)     602     472     732  |     470    0.10
- GET /git/changelog_summary?size=10&page=9                          1     0(0.00%)     864     864     864  |     860    0.10
- GET /git/changeset/0d854fc1e35c145f81d97c4565bd6c07a7d47f19        1     0(0.00%)     964     964     964  |     960    0.00
- GET /git/changeset/3a224ff2bbb8a3782d6db67426aa8bc09063ab08        1     0(0.00%)     469     469     469  |     470    0.00
- GET /git/changeset/5796c5baa3ef0a7d179fdac6cb5815f75f65fd53        1     0(0.00%)     874     874     874  |     870    0.00
- GET /git/changeset/63618af24a67e5fc959217201d9f220383a39fd0        1     0(0.00%)     715     715     715  |     720    0.00
- GET /git/changeset/8c3f3f28cb8c946867365292abfc2c33a5707d3e        1     0(0.00%)    1028    1028    1028  |    1000    0.00
- GET /git/changeset/af3e5d1b2af6322621f26791abf8d619771f04e2        1     0(0.00%)     905     905     905  |     910    0.10
- GET /git/changeset/d299e9e550c1bf8640907fdba1f03cc585ee71df        2     0(0.00%)     539     307     772  |     310    0.00
- GET /git/changeset/d8b396e17ecfe28b39b5f4470f791c434cce40ec        1     0(0.00%)    1169    1169    1169  |    1200    0.00
- GET /git/changeset/fe24d396e1b8d2eedbc07f626af3dcd2b14e6012        1     0(0.00%)    1285    1285    1285  |    1300    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git       3     0(0.00%)     908     477    1271  |     980    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/.gitignore       3     0(0.00%)     784     423    1116  |     810    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/Makefile       1     0(0.00%)    1049    1049    1049  |    1000    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/po       2     0(0.00%)    2989    2668    3311  |    2700    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/po/.gitignore       1     0(0.00%)     860     860     860  |     860    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/po/hu.po       1     0(0.00%)     640     640     640  |     640    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/po/sv.po       1     0(0.00%)     905     905     905  |     910    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/notes-merge.c       1     0(0.00%)     645     645     645  |     650    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/perl       1     0(0.00%)    1516    1516    1516  |    1500    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/perl/Git       1     0(0.00%)    1018    1018    1018  |    1000    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/progress.h       1     0(0.00%)    1179    1179    1179  |    1200    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/sigchain.c       1     0(0.00%)     927     927     927  |     930    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/templates       1     0(0.00%)    4762    4762    4762  |    4800    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/templates/hooks--prepare-commit-msg.sample       1     0(0.00%)     841     841     841  |     840    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/test-hashmap.c       1     0(0.00%)     864     864     864  |     860    0.00
- GET /git/files/6c4ab27f2378ce67940b4496365043119d7ffff2/vcs-svn       1     0(0.00%)    3691    3691    3691  |    3700    0.00
- GET /git/files/tip/                                                3     0(0.00%)   42597   40984   43882  |   43000    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/git-web--browse.sh       1     0(0.00%)     411     411     411  |     410    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/.gitignore       1     0(0.00%)     509     509     509  |     510    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/Makefile       1     0(0.00%)     863     863     863  |     860    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/gitk-git/po/it.po       1     0(0.00%)     289     289     289  |     290    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/line-range.c       1     0(0.00%)     182     182     182  |     180    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/perl/Git/I18N.pm       2     0(0.00%)     496     379     614  |     380    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/templates/branches--       1     0(0.00%)     675     675     675  |     680    0.00
- GET /git/raw/6c4ab27f2378ce67940b4496365043119d7ffff2/templates/this--description       1     0(0.00%)     559     559     559  |     560    0.00
---------------------------------------------------------------------------------------------------------------------------------------------
- Total                                                            500     0(0.00%)                                       1.30

rhodecode/tests/test

@@ -1,498 +0,0 b''
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>
-    Gist &middot; 22
-</title>
-        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-            <meta name="robots" content="index, nofollow"/>
-        <link rel="icon" href="/images/favicon.ico?ver=b5cbcb03" sizes="16x16 32x32" type="image/png" />
-            <link rel="stylesheet" type="text/css" href="/css/style.css?ver=b5cbcb03" media="screen"/>
-            <!--[if lt IE 9]>
-                <link rel="stylesheet" type="text/css" href="/css/ie.css?ver=b5cbcb03" media="screen"/>
-            <![endif]-->
-            <script src="/js/rhodecode/i18n/en.js?ver=b5cbcb03"></script>
-            <script type="text/javascript">
-            // register templateContext to pass template variables to JS
-            var templateContext = {
-    repo_name: "",
-    repo_type: null,
-    repo_landing_commit: null,
-    rhodecode_user: {
-        username: "default",
-        email: "[e-mail]",
-    },
-    visual: {
-        default_renderer: "rst"
-    },
-    commit_data: {
-        commit_id: null,
-    },
-    pull_request_data: {
-        pull_request_id: null,
-    },
-    timeago: {
-        refresh_time: 120000,
-        cutoff_limit: 604800000
-    }
-};
-            var REPO_NAME = "";
-            var REPO_LANDING_REV = '';
-            var REPO_TYPE = '';
-            var APPLICATION_URL = "";
-            var DEFAULT_RENDERER = "rst";
-            var CSRF_TOKEN = "0fd2775cf20f09b9942125e6ffb4c6da143d1b14";
-            var USER = {name:'default'};
-            var APPENLIGHT = {
-              enabled: false,
-              key: 'YOUR_API_PUBLIC_KEY',
-              serverUrl: 'https://api.appenlight.com',
-              requestInfo: {
-                  ip: '0.0.0.0',
-                  username: 'default'
-              }
-            };
-            </script>
-            <!--[if lt IE 9]>
-            <script language="javascript" type="text/javascript" src="/js/excanvas.min.js"></script>
-            <![endif]-->
-            <script language="javascript" type="text/javascript" src="/js/scripts.js?ver=b5cbcb03"></script>
-            <script>CodeMirror.modeURL = "/js/mode/%N/%N.js";</script>
-            <script type="text/javascript">
-            $(document).ready(function(){
-              tooltip_activate();
-              show_more_event();
-              show_changeset_tooltip();
-              timeagoActivate();
-            })
-            </script>
-    </head>
-    <body id="body">
-        <noscript>
-            <div class="noscript-error">
-                Please enable JavaScript to use RhodeCode Enterprise
-            </div>
-        </noscript>
-      <!--[if IE 7]>
-      <script>$(document.body).addClass('ie7')</script>
-      <![endif]-->
-      <!--[if IE 8]>
-      <script>$(document.body).addClass('ie8')</script>
-      <![endif]-->
-      <!--[if IE 9]>
-      <script>$(document.body).addClass('ie9')</script>
-      <![endif]-->
-<div class="outerwrapper">
-  <!-- HEADER -->
-  <div class="header">
-      <div id="header-inner" class="wrapper">
-          <div id="logo">
-              <div class="logo-wrapper">
-                  <a href="/"><img src="/images/rhodecode-logo-white-216x60.png" alt="RhodeCode"/></a>
-              </div>
-          </div>
-          <!-- MENU BAR NAV -->
-    <ul id="quick" class="main_nav navigation horizontal-list">
-      <!-- repo switcher -->
-      <li class=" repo_switcher_li has_select2">
-        <input id="repo_switcher" name="repo_switcher" type="hidden">
-      </li>
-        <li class="">
-          <a class="menulink" title="Show Public activity journal" href="/_admin/public_journal">
-            <div class="menulabel">Public journal</div>
-          </a>
-        </li>
-        <li class="active">
-          <a class="menulink childs" title="Show Gists" href="/_admin/gists">
-            <div class="menulabel">Gists</div>
-          </a>
-        </li>
-      <li class="">
-          <a class="menulink" title="Search in repositories you have access to" href="/_admin/search">
-            <div class="menulabel">Search</div>
-          </a>
-      </li>
-    <li id="quick_login_li">
-      <a id="quick_login_link" class="menulink childs">
-  <img class="gravatar gravatar-large" src="data:image/svg+xml;base64,CiAgICAgICAgPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgICAgICAg
-dmVyc2lvbj0iMS4xIiB4PSIwcHgiIHk9IjBweCIgd2lkdGg9IjQwIiBoZWlnaHQ9IjQwIgogICAg
-ICAgIHZpZXdCb3g9Ii0xNSAtMTAgNDM5LjE2NSA0MjkuMTY0IgoKICAgICAgICB4bWw6c3BhY2U9
-InByZXNlcnZlIgogICAgICAgIHN0eWxlPSJiYWNrZ3JvdW5kOiM5Nzk3OTc7IiA+CgogICAgICAg
-IDxwYXRoIGQ9Ik0yMDQuNTgzLDIxNi42NzFjNTAuNjY0LDAsOTEuNzQtNDguMDc1LAogICAgICAg
-ICAgICAgICAgIDkxLjc0LTEwNy4zNzhjMC04Mi4yMzctNDEuMDc0LTEwNy4zNzctOTEuNzQtMTA3
-LjM3NwogICAgICAgICAgICAgICAgIGMtNTAuNjY4LDAtOTEuNzQsMjUuMTQtOTEuNzQsMTA3LjM3
-N0MxMTIuODQ0LAogICAgICAgICAgICAgICAgIDE2OC41OTYsMTUzLjkxNiwyMTYuNjcxLAogICAg
-ICAgICAgICAgICAgIDIwNC41ODMsMjE2LjY3MXoiIGZpbGw9IiNmZmYiLz4KICAgICAgICA8cGF0
-aCBkPSJNNDA3LjE2NCwzNzQuNzE3TDM2MC44OCwKICAgICAgICAgICAgICAgICAyNzAuNDU0Yy0y
-LjExNy00Ljc3MS01LjgzNi04LjcyOC0xMC40NjUtMTEuMTM4bC03MS44My0zNy4zOTIKICAgICAg
-ICAgICAgICAgICBjLTEuNTg0LTAuODIzLTMuNTAyLTAuNjYzLTQuOTI2LDAuNDE1Yy0yMC4zMTYs
-CiAgICAgICAgICAgICAgICAgMTUuMzY2LTQ0LjIwMywyMy40ODgtNjkuMDc2LDIzLjQ4OGMtMjQu
-ODc3LAogICAgICAgICAgICAgICAgIDAtNDguNzYyLTguMTIyLTY5LjA3OC0yMy40ODgKICAgICAg
-ICAgICAgICAgICBjLTEuNDI4LTEuMDc4LTMuMzQ2LTEuMjM4LTQuOTMtMC40MTVMNTguNzUsCiAg
-ICAgICAgICAgICAgICAgMjU5LjMxNmMtNC42MzEsMi40MS04LjM0Niw2LjM2NS0xMC40NjUsMTEu
-MTM4TDIuMDAxLDM3NC43MTcKICAgICAgICAgICAgICAgICBjLTMuMTkxLDcuMTg4LTIuNTM3LDE1
-LjQxMiwxLjc1LDIyLjAwNWM0LjI4NSwKICAgICAgICAgICAgICAgICA2LjU5MiwxMS41MzcsMTAu
-NTI2LDE5LjQsMTAuNTI2aDM2Mi44NjFjNy44NjMsMCwxNS4xMTctMy45MzYsCiAgICAgICAgICAg
-ICAgICAgMTkuNDAyLTEwLjUyNyBDNDA5LjY5OSwzOTAuMTI5LAogICAgICAgICAgICAgICAgIDQx
-MC4zNTUsMzgxLjkwMiw0MDcuMTY0LDM3NC43MTd6IiBmaWxsPSIjZmZmIi8+CiAgICAgICAgPC9z
-dmc+
-" height="20" width="20">
-        <span class="user">
-            <span>Sign in</span>
-        </span>
-      </a>
-  <div class="user-menu submenu">
-      <div id="quick_login">
-            <h4>Sign in to your account</h4>
-            <form action="/_admin/login?came_from=%2F_admin%2Fgists%2F22" method="post">
-            <div class="form form-vertical">
-                <div class="fields">
-                    <div class="field">
-                        <div class="label">
-                            <label for="username">Username:</label>
-                        </div>
-                        <div class="input">
-                            <input class="focus" id="username" name="username" tabindex="1" type="text" />
-                        </div>
-                    </div>
-                    <div class="field">
-                        <div class="label">
-                            <label for="password">Password:</label>
-                            <span class="forgot_password"><a href="/_admin/password_reset">(Forgot password?)</a></span>
-                        </div>
-                        <div class="input">
-                            <input class="focus" id="password" name="password" tabindex="2" type="password" />
-                        </div>
-                    </div>
-                    <div class="buttons">
-                        <div class="register">
-                         <a href="/_admin/register">Don&#39;t have an account ?</a>
-                        </div>
-                        <div class="submit">
-                            <input class="btn btn-small" id="sign_in" name="sign_in" tabindex="3" type="submit" value="Sign In" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-            </form>
-      </div>
-  </div>
-    </li>
-    </ul>
-    <script type="text/javascript">
-        var visual_show_public_icon = "True" == "True";
-        /*format the look of items in the list*/
-        var format = function(state, escapeMarkup){
-            if (!state.id){
-              return state.text; // optgroup
-            }
-            var obj_dict = state.obj;
-            var tmpl = '';
-            if(obj_dict && state.type == 'repo'){
-                if(obj_dict['repo_type'] === 'hg'){
-                    tmpl += '<i class="icon-hg"></i> ';
-                }
-                else if(obj_dict['repo_type'] === 'git'){
-                    tmpl += '<i class="icon-git"></i> ';
-                }
-                else if(obj_dict['repo_type'] === 'svn'){
-                    tmpl += '<i class="icon-svn"></i> ';
-                }
-                if(obj_dict['private']){
-                    tmpl += '<i class="icon-lock" ></i> ';
-                }
-                else if(visual_show_public_icon){
-                    tmpl += '<i class="icon-unlock-alt"></i> ';
-                }
-            }
-            if(obj_dict && state.type == 'group'){
-                    tmpl += '<i class="icon-folder-close"></i> ';
-            }
-            tmpl += escapeMarkup(state.text);
-            return tmpl;
-        };
-        var formatResult = function(result, container, query, escapeMarkup) {
-            return format(result, escapeMarkup);
-        };
-        var formatSelection = function(data, container, escapeMarkup) {
-            return format(data, escapeMarkup);
-        };
-        $("#repo_switcher").select2({
-            cachedDataSource: {},
-            minimumInputLength: 2,
-            placeholder: '<div class="menulabel">Go to <div class="show_more"></div></div>',
-            dropdownAutoWidth: true,
-            formatResult: formatResult,
-            formatSelection: formatSelection,
-            containerCssClass: "repo-switcher",
-            dropdownCssClass: "repo-switcher-dropdown",
-            escapeMarkup: function(m){
-                // don't escape our custom placeholder
-                if(m.substr(0,23) == '<div class="menulabel">'){
-                    return m;
-                }
-                return Select2.util.escapeMarkup(m);
-            },
-            query: $.debounce(250, function(query){
-                self = this;
-                var cacheKey = query.term;
-                var cachedData = self.cachedDataSource[cacheKey];
-                if (cachedData) {
-                    query.callback({results: cachedData.results});
-                } else {
-                    $.ajax({
-                        url: "/_repos_and_groups",
-                        data: {'query': query.term},
-                        dataType: 'json',
-                        type: 'GET',
-                        success: function(data) {
-                            self.cachedDataSource[cacheKey] = data;
-                            query.callback({results: data.results});
-                        },
-                        error: function(data, textStatus, errorThrown) {
-                            alert("Error while fetching entries.\nError code {0} ({1}).".format(data.status, data.statusText));
-                        }
-                    })
-                }
-            })
-        });
-        $("#repo_switcher").on('select2-selecting', function(e){
-            e.preventDefault();
-            window.location = pyroutes.url('summary_home', {'repo_name': e.val});
-        });
-        // general help "?"
-        Mousetrap.bind(['?'], function(e) {
-            $('#help_kb').modal({})
-        });
-        // / open the quick filter
-        Mousetrap.bind(['/'], function(e) {
-            $("#repo_switcher").select2("open");
-            // return false to prevent default browser behavior
-            // and stop event from bubbling
-            return false;
-        });
-        // general nav g + action
-        Mousetrap.bind(['g h'], function(e) {
-            window.location = pyroutes.url('home');
-        });
-        Mousetrap.bind(['g g'], function(e) {
-            window.location = pyroutes.url('gists', {'private':1});
-        });
-        Mousetrap.bind(['g G'], function(e) {
-            window.location = pyroutes.url('gists', {'public':1});
-        });
-        Mousetrap.bind(['n g'], function(e) {
-            window.location = pyroutes.url('new_gist');
-        });
-        Mousetrap.bind(['n r'], function(e) {
-            window.location = pyroutes.url('new_repo');
-        });
-    </script>
-    <script src="/js/rhodecode/base/keyboard-bindings.js?ver=b5cbcb03"></script>
-          <!-- END MENU BAR NAV -->
-      </div>
-  </div>
-  <!-- END HEADER -->
-  <!-- CONTENT -->
-  <div id="content" class="wrapper">
-    <div class="flash_msg">
-    <script>
-    if (typeof jQuery != 'undefined') {
-        $(".alert").alert();
-    }
-    </script>
-</div>
-      <div class="main">
-<div class="box">
-    <!-- box / title -->
-    <div class="title">
-    <div class="breadcrumbs">
-    Gist &middot; 22
-    / URL: http://test.example.com:80/_admin/gists/22
-    </div>
-    </div>
-    <div class="table">
-        <div id="files_data">
-            <div id="codeblock" class="codeblock">
-                <div class="code-header">
-                    <div class="stats">
-                        <div class="buttons">
-                          <a class="btn btn-mini" href="/_admin/gists/22/tip/raw">Show as Raw</a>
-                        </div>
-                        <div class="left" >
-                          <span> gist-desc</span>
-                           <span>Expires:
-                             never
-                          </span>
-                       </div>
-                    </div>
-                    <div class="author">
-                        <div title="RhodeCode Admin &lt;[e-mail]&gt;">
-  <div class="rc-user tooltip" title="RhodeCode Admin &lt;[e-mail]&gt;">
-  <img class="gravatar" src="data:image/svg+xml;base64,CiAgICAgICAgPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHBvaW50ZXIt
-ZXZlbnRzPSJub25lIgogICAgICAgICAgICAgd2lkdGg9IjMyIiBoZWlnaHQ9IjMyIgogICAgICAg
-ICAgICAgc3R5bGU9IndpZHRoOiAxMDAlOyBoZWlnaHQ6IDEwMCU7IGJhY2tncm91bmQtY29sb3I6
-ICM1OWIzODkiCiAgICAgICAgICAgICB2aWV3Qm94PSIwIDAgMzIgMzIiPgogICAgICAgICAgICA8
-dGV4dCB0ZXh0LWFuY2hvcj0ibWlkZGxlIiB5PSI1MCUiIHg9IjUwJSIgZHk9IjAuMzVlbSIKICAg
-ICAgICAgICAgICAgICAgcG9pbnRlci1ldmVudHM9ImF1dG8iIGZpbGw9IiNmZmYiCiAgICAgICAg
-ICAgICAgICAgIGZvbnQtZmFtaWx5PSJwcm94aW1hbm92YXJlZ3VsYXIsUHJveGltYSBOb3ZhIFJl
-Z3VsYXIsUHJveGltYSBOb3ZhLEFyaWFsLEx1Y2lkYSBHcmFuZGUsc2Fucy1zZXJpZiIKICAgICAg
-ICAgICAgICAgICAgc3R5bGU9ImZvbnQtd2VpZ2h0OiA0MDA7IGZvbnQtc2l6ZTogMTcuMjk3Mjk3
-Mjk3M3B4OyI+VE0KICAgICAgICAgICAgPC90ZXh0PgogICAgICAgIDwvc3ZnPg==
-" height="16" width="16">
-    <span class="user"> <a href="/_profiles/test_admin">test_admin</a></span>
-  </div>
- - created <time class="timeago tooltip" title="Mon, 23 May 2016 19:54:34" datetime="2016-05-23 19:54:34+00:00">Mon, 23 May 2016 19:54:34</time>
-                        </div>
-                    </div>
-                    <div class="commit">added file: gist-show-me</div>
-                </div>
-<!--                 <div id="c-G-eff3be0ea272" class="stats" >
-                    <a href="http://test.example.com:80/_admin/gists/22">¶</a>
-                    <b >gist-show-me</b>
-                    <div>
-                       <a class="btn btn-mini" href="/_admin/gists/22/3f6f18ddcd5669697303ab3cd5a2eabb1c558c6f/raw/gist-show-me">Show as raw</a>
-                    </div>
-                </div> -->
-                <div class="code-body textarea text-area editor">
-                        <table class="code-highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><a href="#L1">1</a></pre></div></td><td id="hlcode" class="code"><div class="code-highlight"><pre><div id="L1"><a name="L-1"></a>some gist
-</div></pre></div>
-</td></tr></table>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-      </div>
-  </div>
-  <!-- END CONTENT -->
-</div>
-<!-- FOOTER -->
-<div id="footer">
-   <div id="footer-inner" class="title wrapper">
-       <div>
-           <p class="footer-link-right">
-                   RhodeCode Enterprise 4.0.0 Community Edition
-               &copy; 2010-2016, <a href="https://rhodecode.com" target="_blank">RhodeCode GmbH</a>. All rights reserved.
-                  <a href="https://rhodecode.com/help/" target="_blank">Support</a>
-           </p>
-           <p class="server-instance" style="display:none">
-                   RhodeCode instance id: vps1.local-105134
-           </p>
-       </div>
-   </div>
-</div>
-<!-- END FOOTER -->
-<div class="modal" id="help_kb" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title" id="myModalLabel">Keyboard shortcuts</h4>
-        </div>
-        <div class="modal-body">
-              <div class="block-left">
-                <table class="keyboard-mappings">
-                    <tbody>
-                  <tr>
-                    <th></th>
-                    <th>Site-wide shortcuts</th>
-                  </tr>
-                  <tr>
-                    <td class="keys">
-                      <span class="key tag">/</span>
-                    </td>
-                    <td>Open quick search box</td>
-                  </tr>
-                  <tr>
-                    <td class="keys">
-                      <span class="key tag">g h</span>
-                    </td>
-                    <td>Goto home page</td>
-                  </tr>
-                  <tr>
-                    <td class="keys">
-                      <span class="key tag">g g</span>
-                    </td>
-                    <td>Goto my private gists page</td>
-                  </tr>
-                  <tr>
-                    <td class="keys">
-                      <span class="key tag">g G</span>
-                    </td>
-                    <td>Goto my public gists page</td>
-                  </tr>
-                  <tr>
-                    <td class="keys">
-                      <span class="key tag">n r</span>
-                    </td>
-                    <td>New repository page</td>
-                  </tr>
-                  <tr>
-                    <td class="keys">
-                      <span class="key tag">n g</span>
-                    </td>
-                    <td>New gist page</td>
-                  </tr>
-                </tbody>
-                  </table>
-              </div>
-              <div class="block-left">
-                <table class="keyboard-mappings">
-                <tbody>
-                  <tr>
-                    <th></th>
-                    <th>Repositories</th>
-                  </tr>
-                  <tr>
-                    <td class="keys">
-                      <span class="key tag">g s</span>
-                    </td>
-                    <td>Goto summary page</td>
-                  </tr>
-                  <tr>
-                    <td class="keys">
-                      <span class="key tag">g c</span>
-                    </td>
-                    <td>Goto changelog page</td>
-                  </tr>
-                  <tr>
-                    <td class="keys">
-                      <span class="key tag">g f</span>
-                    </td>
-                    <td>Goto files page</td>
-                  </tr>
-                  <tr>
-                    <td class="keys">
-                      <span class="key tag">g F</span>
-                    </td>
-                    <td>Goto files page with file search activated</td>
-                  </tr>
-                  <tr>
-                    <td class="keys">
-                      <span class="key tag">g p</span>
-                    </td>
-                    <td>Goto pull requests page</td>
-                  </tr>
-                  <tr>
-                    <td class="keys">
-                      <span class="key tag">g o</span>
-                    </td>
-                    <td>Goto repository settings</td>
-                  </tr>
-                  <tr>
-                    <td class="keys">
-                      <span class="key tag">g O</span>
-                    </td>
-                    <td>Goto repository permissions settings</td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-        </div>
-        <div class="modal-footer">
-        </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-    </body>
-</html>
  No newline at end of file