Merge branch 'master' of ssh://bitbucket.org/yackob03/quay

Conflicts: endpoints/api.py
2013-09-27 14:57:03 -04:00 · 2013-09-27 14:57:03 -04:00 · 98dc20542c
commit 98dc20542c
parent 1883014ad9 685479da7b
4 changed files with 30 additions and 3 deletions
--- a/endpoints/api.py
+++ b/endpoints/api.py
@ -43,10 +43,13 @@ def create_repo_api():
@login_required
 def list_repos_api():
  def repo_view(repo_perm):
+    
+
    return {
      'namespace': repo_perm.repository.namespace,
      'name': repo_perm.repository.name,
      'role': repo_perm.role.name,
+      'description': repo_perm.repository.description,
    }

  repos = [repo_view(repo)