Merge branch master into bees

endpoints/api/repoemail.py

@@ -4,7 +4,7 @@ from flask import request, abort
 
 from endpoints.api import (resource, nickname, require_repo_admin, RepositoryParamResource,
                            log_action, validate_json_request, NotFound, internal_only,
-                           path_param)
+                           path_param, show_if)
 
 from app import tf
 from data import model
@@ -20,12 +20,13 @@ def record_view(record):
   return {
     'email': record.email,
     'repository': record.repository.name,
-    'namespace': record.repository.namespace,
+    'namespace': record.repository.namespace_user.username,
     'confirmed': record.confirmed
   }
 
 
 @internal_only
+@show_if(features.MAILING)
 @resource('/v1/repository/<repopath:repository>/authorizedemail/<email>')
 @path_param('repository', 'The full path of the repository. e.g. namespace/name')
 @path_param('email', 'The e-mail address')