diff --git a/docs/api/api.rst b/docs/api/api.rst --- a/docs/api/api.rst +++ b/docs/api/api.rst @@ -175,7 +175,7 @@ INPUT:: api_key : "" method : "get_ip" args : { - "userid" : "", + "userid" : "" } OUTPUT:: @@ -186,7 +186,7 @@ OUTPUT:: "user_ips" : [ { "ip_addr" : "", - "ip_range" : ["", ""], + "ip_range" : ["", ""] }, ... ] @@ -233,7 +233,7 @@ OUTPUT:: "hg.register.manual_activate"], "repositories" : {"repo1" : "repository.none"}, "repositories_groups" : {"Group1" : "group.read"} - }, + } } error : null @@ -266,7 +266,7 @@ OUTPUT:: "active" : "", "admin" : "", "ldap_dn" : "", - "last_login" : "", + "last_login" : "" }, … ] @@ -311,8 +311,8 @@ OUTPUT:: "active" : "", "admin" : "", "ldap_dn" : "", - "last_login": "", - }, + "last_login": "" + } } error : null @@ -359,8 +359,8 @@ OUTPUT:: "active" : "", "admin" : "", "ldap_dn" : "", - "last_login": "", - }, + "last_login": "" + } } error : null @@ -376,7 +376,7 @@ INPUT:: api_key : "" method : "delete_user" args : { - "userid" : "", + "userid" : "" } OUTPUT:: @@ -423,7 +423,7 @@ OUTPUT:: "active" : "", "admin" : "", "ldap_dn" : "", - "last_login": "", + "last_login": "" }, … ] @@ -450,7 +450,7 @@ OUTPUT:: { "users_group_id" : "", "group_name" : "", - "active" : "", + "active" : "" }, … ] @@ -481,8 +481,8 @@ OUTPUT:: "users_group" : { "users_group_id" : "", "group_name" : "", - "active" : "", - }, + "active" : "" + } } error : null @@ -500,14 +500,14 @@ INPUT:: method : "add_user_user_group" args : { "usersgroupid" : "", - "userid" : "", + "userid" : "" } OUTPUT:: id : result : { - "success" : True|False # depends on if member is in group + "success" : True|False, # depends on if member is in group "msg" : "added member `` to a user group `` | User is already in that group" } @@ -527,7 +527,7 @@ INPUT:: method : "remove_user_from_user_group" args : { "usersgroupid" : "", - "userid" : "", + "userid" : "" } OUTPUT:: @@ -556,7 +556,7 @@ INPUT:: args : { "repoid" : "", "with_revision_names" : " = Optional(False)", - "with_pullrequests" : " = Optional(False)", + "with_pullrequests" : " = Optional(False)" } OUTPUT:: @@ -565,7 +565,7 @@ OUTPUT:: result : None if repository does not exist or { "repo_id" : "", - "repo_name" : "" + "repo_name" : "", "repo_type" : "", "clone_uri" : "", "enable_downloads" : "", @@ -623,7 +623,7 @@ OUTPUT:: "active" : "", "admin" : "", "ldap_dn" : "", - "last_login" : "", + "last_login" : "" }, … ], @@ -650,7 +650,7 @@ OUTPUT:: "url" : "", "reviewers" : [ { - "username" : "", + "username" : "" }, ... ], @@ -669,7 +669,7 @@ OUTPUT:: { "username" : "", "text" : "", - "comment_id" : "", + "comment_id" : "" }, ... ], @@ -712,7 +712,7 @@ OUTPUT:: result : [ { "repo_id" : "", - "repo_name" : "" + "repo_name" : "", "repo_type" : "", "clone_uri" : "", "private" : "", @@ -722,7 +722,7 @@ OUTPUT:: "owner" : "", "fork_of" : "", "enable_downloads" : "", - "enable_statistics": "", + "enable_statistics": "" }, … ] @@ -741,7 +741,7 @@ INPUT:: api_key : "" method : "get_repo_nodes" args : { - "repoid" : "" + "repoid" : "", "revision" : "", "root_path" : "", "ret_type" : " = Optional('all')" @@ -752,8 +752,8 @@ OUTPUT:: id : result : [ { - "name" : "" - "type" : "", + "name" : "", + "type" : "" }, … ] @@ -786,7 +786,7 @@ INPUT:: "clone_uri" : " = Optional(None)", "landing_rev" : " = Optional('tip')", "enable_downloads" : " = Optional(False)", - "enable_statistics": " = Optional(False)", + "enable_statistics": " = Optional(False)" } OUTPUT:: @@ -796,7 +796,7 @@ OUTPUT:: "msg" : "Created new repository ``", "repo" : { "repo_id" : "", - "repo_name" : "" + "repo_name" : "", "repo_type" : "", "clone_uri" : "", "private" : "", @@ -806,8 +806,8 @@ OUTPUT:: "owner" : "", "fork_of" : "", "enable_downloads" : "", - "enable_statistics": "", - }, + "enable_statistics": "" + } } error : null @@ -825,7 +825,7 @@ INPUT:: api_key : "" method : "update_repo" args : { - "repoid" : "" + "repoid" : "", "name" : " = Optional('')", "group" : " = Optional(None)", "owner" : "", @@ -834,7 +834,7 @@ INPUT:: "clone_uri" : " = Optional(None)", "landing_rev" : " = Optional('tip')", "enable_downloads" : " = Optional(False)", - "enable_statistics": " = Optional(False)", + "enable_statistics": " = Optional(False)" } OUTPUT:: @@ -844,7 +844,7 @@ OUTPUT:: "msg" : "updated repo ID:repo_id ``", "repository" : { "repo_id" : "", - "repo_name" : "" + "repo_name" : "", "repo_type" : "", "clone_uri" : "", "private" : "", @@ -863,7 +863,7 @@ OUTPUT:: "revision": "", "short_id": "" } - }, + } } error : null @@ -941,9 +941,9 @@ INPUT:: api_key : "" method : "grant_user_permission" args : { - "repoid" : "" - "userid" : "" - "perm" : "(repository.(none|read|write|admin))", + "repoid" : "", + "userid" : "", + "perm" : "(repository.(none|read|write|admin))" } OUTPUT:: @@ -967,7 +967,7 @@ INPUT:: api_key : "" method : "revoke_user_permission" args : { - "repoid" : "" + "repoid" : "", "userid" : "" } @@ -993,9 +993,9 @@ INPUT:: api_key : "" method : "grant_user_group_permission" args : { - "repoid" : "" - "usersgroupid" : "" - "perm" : "(repository.(none|read|write|admin))", + "repoid" : "", + "usersgroupid" : "", + "perm" : "(repository.(none|read|write|admin))" } OUTPUT:: @@ -1019,7 +1019,7 @@ INPUT:: api_key : "" method : "revoke_user_group_permission" args : { - "repoid" : "" + "repoid" : "", "usersgroupid" : "" } @@ -1155,7 +1155,7 @@ INPUT:: api_key : "" method : "get_pullrequest" args : { - "pullrequest_id" : "", + "pullrequest_id" : "" } OUTPUT:: @@ -1169,7 +1169,7 @@ OUTPUT:: "url" : "", "reviewers" : [ { - "username" : "", + "username" : "" }, ... ], @@ -1188,7 +1188,7 @@ OUTPUT:: { "username" : "", "text" : "", - "comment_id" : "", + "comment_id" : "" }, ... ], @@ -1223,7 +1223,7 @@ INPUT:: "pull_request_id" : "", "comment_msg" : Optional(''), "status" : Optional(None), # "under_review", "approved" or "rejected" - "close_pr" : Optional(False)", + "close_pr" : Optional(False)" } OUTPUT:: diff --git a/kallithea/controllers/api/api.py b/kallithea/controllers/api/api.py --- a/kallithea/controllers/api/api.py +++ b/kallithea/controllers/api/api.py @@ -174,7 +174,7 @@ class ApiController(JSONRPCController): id : result : { - "msg" : "Pulled from ``" + "msg" : "Pulled from ``", "repository" : "" } error : null @@ -307,7 +307,7 @@ class ApiController(JSONRPCController): "user_ips" : [ { "ip_addr" : "", - "ip_range" : ["", ""], + "ip_range" : ["", ""] }, ... ] @@ -377,7 +377,7 @@ class ApiController(JSONRPCController): "repositories" : {"repo1" : "repository.none"}, "repositories_groups" : {"Group1" : "group.read"}, "user_groups" : { "usrgrp1" : "usergroup.admin" } - }, + } } error : null """ @@ -529,7 +529,7 @@ class ApiController(JSONRPCController): id : result : { "msg" : "updated user ID: ", - "user" : , + "user" : } error : null @@ -629,9 +629,9 @@ class ApiController(JSONRPCController): { "users_group_id" : "", "group_name" : "", - "group_description" : "" + "group_description" : "", "active" : "", - "owner" : "" + "owner" : "", "members" : [,...] } error : null @@ -946,7 +946,7 @@ class ApiController(JSONRPCController): id : result : { "repo_id" : "", - "repo_name" : "" + "repo_name" : "", "repo_type" : "", "clone_uri" : "", "enable_downloads" : "", @@ -962,7 +962,7 @@ class ApiController(JSONRPCController): "raw_id" : "", "revision": "", "short_id": "" - } + }, "owner" : "", "fork_of" : "", "members" : [ @@ -978,7 +978,7 @@ class ApiController(JSONRPCController): "permission" : "usergroup.(read|write|admin)" }, … - ] + ], "followers" : [, ...], "tags" : { @@ -992,7 +992,7 @@ class ApiController(JSONRPCController): "bookmarks" : { "" : "", ... - }, + } } error : null """ @@ -1047,7 +1047,7 @@ class ApiController(JSONRPCController): result : [ { "repo_id" : "", - "repo_name" : "" + "repo_name" : "", "repo_type" : "", "clone_uri" : "", "private" : "", @@ -1057,7 +1057,7 @@ class ApiController(JSONRPCController): "owner" : "", "fork_of" : "", "enable_downloads" : "", - "enable_statistics": "", + "enable_statistics": "" }, … ] @@ -1096,8 +1096,8 @@ class ApiController(JSONRPCController): id : result : [ { - "name" : "" - "type" : "", + "name" : "", + "type" : "" }, … ] @@ -1744,7 +1744,7 @@ class ApiController(JSONRPCController): id : result : { - "msg" : "created new repo group ``" + "msg" : "created new repo group ``", "repo_group" : } error : null