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

2013-11-11 18:05:29 -05:00 · 2013-11-11 18:05:29 -05:00 · 6be20ff626
commit 6be20ff626
parent e5994bab9b 743e95c50e
4 changed files with 76 additions and 56 deletions
--- a/endpoints/api.py
+++ b/endpoints/api.py
@ -347,6 +347,7 @@ def get_organization(orgname):
      is_admin = admin_org.can()
      return {
        'name': o.username,
+        'email': o.email if is_admin else '',
        'gravatar': compute_hash(o.email),
        'teams': {t.name : team_view(orgname, t) for t in teams},
        'is_admin': is_admin