Commit69e64a3

Gauvain Pocentek

committed

Merge branch 'master' ofhttps://github.com/missionrulz/python-gitlab into missionrulz-master

2 parents18de4ef +d9b9f92 commit69e64a3Copy full SHA for 69e64a3

File tree

+20

-0

lines changed

+20

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ class Gitlab(object):`
`67`	`67`	`Attributes:`
`68`	`68`	`user_keys (UserKeyManager): Manager for GitLab users' SSH keys.`
`69`	`69`	`users (UserManager): Manager for GitLab users`
	`70`	`+ group_projects (GroupProjectManager): Manager for GitLab group projects`
`70`	`71`	`group_members (GroupMemberManager): Manager for GitLab group members`
`71`	`72`	`groups (GroupManager): Manager for GitLab members`
`72`	`73`	`hooks (HookManager): Manager for GitLab hooks`
`@@ -134,6 +135,7 @@ def __init__(self, url, private_token=None, email=None, password=None,`
`134`	`135`	`self.settings=ApplicationSettingsManager(self)`
`135`	`136`	`self.user_keys=UserKeyManager(self)`
`136`	`137`	`self.users=UserManager(self)`
	`138`	`+self.group_projects=GroupProjectManager(self)`
`137`	`139`	`self.group_members=GroupMemberManager(self)`
`138`	`140`	`self.groups=GroupManager(self)`
`139`	`141`	`self.hooks=HookManager(self)`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -725,6 +725,24 @@ def search(self, query, **kwargs):`
`725`	`725`	`returnself.gitlab._raw_list(url,self.obj_cls,**kwargs)`
`726`	`726`
`727`	`727`
	`728`	`+classGroupProject(GitlabObject):`
	`729`	`+deflist_projects(self,gid,**kwargs):`
	`730`	`+"""List projects in a group`
	`731`	`+`
	`732`	`+ Attrs:`
	`733`	`+ gid (int): ID of the group`
	`734`	`+`
	`735`	`+ Returns:`
	`736`	`+ list(Group): a list of projects in the group`
	`737`	`+ """`
	`738`	`+url='/groups/%d/projects'%gid`
	`739`	`+returnself.gitlab._raw_list(url,self.obj_cls,**kwargs)`
	`740`	`+`
	`741`	`+`
	`742`	`+classGroupProjectManager(BaseManager):`
	`743`	`+obj_cls=GroupProject`
	`744`	`+`
	`745`	`+`
`728`	`746`	`classHook(GitlabObject):`
`729`	`747`	`_url='/hooks'`
`730`	`748`	`canUpdate=False`

Comments

(0)